35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
|
||
|
Date: Thu, 29 Jun 2017 14:01:11 -0400
|
||
|
Subject: [PATCH] tpm: Use /dev/null for cancel path if none was found
|
||
|
MIME-Version: 1.0
|
||
|
Content-Type: text/plain; charset=UTF-8
|
||
|
Content-Transfer-Encoding: 8bit
|
||
|
|
||
|
TPM 2 does not implement sysfs files for cancellation of commands.
|
||
|
We therefore use /dev/null for the cancel path passed to QEMU.
|
||
|
|
||
|
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
|
||
|
Tested-by: Javier Martinez Canillas <javierm@redhat.com>
|
||
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
(cherry picked from commit dfbb15b75433e520fb1b905c1c3e28753e53e4a5)
|
||
|
---
|
||
|
src/util/virtpm.c | 4 +---
|
||
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||
|
|
||
|
diff --git a/src/util/virtpm.c b/src/util/virtpm.c
|
||
|
index 6d9b0657a..d5c10da38 100644
|
||
|
--- a/src/util/virtpm.c
|
||
|
+++ b/src/util/virtpm.c
|
||
|
@@ -61,9 +61,7 @@ virTPMCreateCancelPath(const char *devpath)
|
||
|
VIR_FREE(path);
|
||
|
}
|
||
|
if (!path)
|
||
|
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||
|
- _("No usable sysfs TPM cancel file could be "
|
||
|
- "found"));
|
||
|
+ ignore_value(VIR_STRDUP(path, "/dev/null"));
|
||
|
} else {
|
||
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||
|
_("TPM device path %s is invalid"), devpath);
|