]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
tpm: Fix memory leak and use existing variable instead
authorStefan Berger <stefanb@linux.vnet.ibm.com>
Fri, 26 Jul 2019 20:56:30 +0000 (16:56 -0400)
committerEric Blake <eblake@redhat.com>
Fri, 26 Jul 2019 21:32:29 +0000 (16:32 -0500)
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>

src/qemu/qemu_tpm.c

index 77ef601f7405c869128346da86bed6b008d1ef5f..66d3fde160379fa919c798ef227b05a98d56d5e0 100644 (file)
@@ -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;
         }