[libvirt] [PATCH 1/4] tpm: Fix memory leak and use existing variable instead

Stefan Berger stefanb at linux.vnet.ibm.com
Fri Jul 26 13:42:43 UTC 2019


Use the existing variables rather then calling virTPMSwtpmXYZ().

Signed-off-by: Stefan Berger <stefanb at linux.ibm.com>
---
 src/qemu/qemu_tpm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 7efd635831..a8a4d734c0 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -508,7 +508,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath,
                 VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD)) {
             virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
                 _("%s does not support passing a passphrase using a file "
-                  "descriptor"), virTPMGetSwtpmSetup());
+                  "descriptor"), swtpm_setup);
             goto cleanup;
         }
         if ((pwdfile_fd = qemuTPMSetupEncryption(secretuuid, cmd)) < 0)
@@ -648,7 +648,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDefPtr tpm,
         if (!virTPMSwtpmCapsGet(VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD)) {
             virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
                   _("%s does not support passing passphrase via file descriptor"),
-                  virTPMGetSwtpm());
+                  swtpm);
             goto error;
         }
 
-- 
2.20.1




More information about the libvir-list mailing list