Accepting request 593852 from home:lyan:branches:Virtualization

Add new look up path sys/class/tpm for tpm cancel path

OBS-URL: https://build.opensuse.org/request/show/593852
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=402

0079-tpm-lookup-cancel-path-under-tpm-de.patch

@@ -0,0 +1,52 @@
+From 9d1099c4ffea481aa803e9cc14a1419f902f52a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Mon, 29 Jan 2018 19:33:04 +0100
+Subject: [PATCH] tpm: lookup cancel path under tpm device class
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since Linux commit 313d21eeab9282e, tpm devices have their own device
+class "tpm" and the cancel path must be looked up under
+/sys/class/tpm/ instead of /sys/class/misc/.
+
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
+Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
+(cherry picked from commit 05b71fb207ab7f016e067bd2a40fc0804362eb74)
+[LY: BSC#1070615]
+Signed-off-by: Liang Yan <lyan@suse.com>
+---
+ hw/tpm/tpm_passthrough.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
+index c440aff4b2..01ecef99aa 100644
+--- a/hw/tpm/tpm_passthrough.c
++++ b/hw/tpm/tpm_passthrough.c
+@@ -206,7 +206,8 @@ static TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb)
+  * Unless path or file descriptor set has been provided by user,
+  * determine the sysfs cancel file following kernel documentation
+  * in Documentation/ABI/stable/sysfs-class-tpm.
+- * From /dev/tpm0 create /sys/class/misc/tpm0/device/cancel
++ * From /dev/tpm0 create /sys/class/tpm/tpm0/device/cancel
++ * before 4.0: /sys/class/misc/tpm0/device/cancel
+  */
+ static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt)
+ {
+@@ -226,9 +227,14 @@ static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt)
+     dev = strrchr(tpm_pt->tpm_dev, '/');
+     if (dev) {
+         dev++;
+-        if (snprintf(path, sizeof(path), "/sys/class/misc/%s/device/cancel",
++        if (snprintf(path, sizeof(path), "/sys/class/tpm/%s/device/cancel",
+                      dev) < sizeof(path)) {
+             fd = qemu_open(path, O_WRONLY);
++            if (fd < 0) {
++            	if (snprintf(path, sizeof(path), "/sys/class/misc/%s/device/cancel", dev) < sizeof(path)) {
++                fd = qemu_open(path, O_WRONLY);
++            	}
++            }
+             if (fd >= 0) {
+                 tpm_pt->options->cancel_path = g_strdup(path);
+             } else {

qemu-linux-user.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  5 18:18:59 UTC 2018 - lyan@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11
+* Patches added:
+  0079-tpm-lookup-cancel-path-under-tpm-de.patch
+
 -------------------------------------------------------------------
 Wed Mar 14 18:41:50 UTC 2018 - brogers@suse.com
 

qemu-linux-user.spec

@@ -104,6 +104,7 @@ Patch0075:      0075-migration-warn-about-inconsistent-s.patch
 Patch0076:      0076-smbios-support-setting-OEM-strings-.patch
 Patch0077:      0077-smbios-Add-1-terminator-if-any-stri.patch
 Patch0078:      0078-Remove-problematic-evdev-86-key-fro.patch
+Patch0079:      0079-tpm-lookup-cancel-path-under-tpm-de.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 Source400:      update_git.sh
@@ -211,6 +212,7 @@ syscall layer occurs on the native hardware and operating system.
 %patch0076 -p1
 %patch0077 -p1
 %patch0078 -p1
+%patch0079 -p1
 
 %build
 ./configure \

qemu-testsuite.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  5 18:18:57 UTC 2018 - lyan@suse.com
+
+- Add new look up path "sys/class/tpm" for tpm cancel path based
+  on Linux 4.0 change (commit 313d21eeab9282e)(bsc#1070615)
+  0079-tpm-lookup-cancel-path-under-tpm-de.patch
+
 -------------------------------------------------------------------
 Wed Mar 14 18:41:48 UTC 2018 - brogers@suse.com
 

qemu-testsuite.spec

@@ -208,6 +208,7 @@ Patch0075:      0075-migration-warn-about-inconsistent-s.patch
 Patch0076:      0076-smbios-support-setting-OEM-strings-.patch
 Patch0077:      0077-smbios-Add-1-terminator-if-any-stri.patch
 Patch0078:      0078-Remove-problematic-evdev-86-key-fro.patch
+Patch0079:      0079-tpm-lookup-cancel-path-under-tpm-de.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -885,6 +886,7 @@ This package provides a service file for starting and stopping KSM.
 %patch0076 -p1
 %patch0077 -p1
 %patch0078 -p1
+%patch0079 -p1
 
 %if 0%{?suse_version} > 1320
 %patch1000 -p1

qemu.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  5 18:18:57 UTC 2018 - lyan@suse.com
+
+- Add new look up path "sys/class/tpm" for tpm cancel path based
+  on Linux 4.0 change (commit 313d21eeab9282e)(bsc#1070615)
+  0079-tpm-lookup-cancel-path-under-tpm-de.patch
+
 -------------------------------------------------------------------
 Wed Mar 14 18:41:48 UTC 2018 - brogers@suse.com
 

qemu.spec

@@ -208,6 +208,7 @@ Patch0075:      0075-migration-warn-about-inconsistent-s.patch
 Patch0076:      0076-smbios-support-setting-OEM-strings-.patch
 Patch0077:      0077-smbios-Add-1-terminator-if-any-stri.patch
 Patch0078:      0078-Remove-problematic-evdev-86-key-fro.patch
+Patch0079:      0079-tpm-lookup-cancel-path-under-tpm-de.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -885,6 +886,7 @@ This package provides a service file for starting and stopping KSM.
 %patch0076 -p1
 %patch0077 -p1
 %patch0078 -p1
+%patch0079 -p1
 
 %if 0%{?suse_version} > 1320
 %patch1000 -p1