From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Fri, 26 Jul 2019 20:56:30 +0000 (-0400)
Subject: tpm: Fix memory leak and use existing variable instead
X-Git-Tag: v5.6.0-rc1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8358f94e0ae5b7436bb056da03b342dd76b31fe;p=thirdparty%2Flibvirt.git

tpm: Fix memory leak and use existing variable instead

Use the existing variables rather then calling virTPMSwtpmXYZ().

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
Message-Id: <20190726205633.2041912-2-stefanb@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 77ef601f74..66d3fde160 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -512,7 +512,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)
@@ -652,7 +652,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;
         }