[libvirt] [PATCH 1/5] qemu: Add missing encinfo cleanup

Peter Krempa pkrempa at redhat.com
Thu Oct 19 15:34:28 UTC 2017


From: John Ferlan <jferlan at redhat.com>

When commit id 'da86c6c22' added support for diskPriv->encinfo in
qemuDomainSecretDiskPrepare a change to qemuDomainSecretDiskDestroy
to was missed. Although qemuDomainDiskPrivateDispose probably would
do the trick.

Signed-off-by: John Ferlan <jferlan at redhat.com>
---
 src/qemu/qemu_domain.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 23b9c6c13..41009331a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1302,10 +1302,11 @@ qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk)
 {
     qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);

-    if (!diskPriv || !diskPriv->secinfo)
-        return;
+    if (diskPriv && diskPriv->secinfo)
+        qemuDomainSecretInfoFree(&diskPriv->secinfo);

-    qemuDomainSecretInfoFree(&diskPriv->secinfo);
+    if (diskPriv && diskPriv->encinfo)
+        qemuDomainSecretInfoFree(&diskPriv->encinfo);
 }


-- 
2.14.1




More information about the libvir-list mailing list