From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 10 Jul 2020 12:54:09 +0000 (+0200)
Subject: qemuDomainSecretHostdevDestroy: Don't clear secinfo alias
X-Git-Tag: v6.6.0-rc1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aca4865a8c76d72ba936953078e18dc417b6c82;p=thirdparty%2Flibvirt.git

qemuDomainSecretHostdevDestroy: Don't clear secinfo alias

We need the alias to deal with hot-unplug of the hostdev. Use
qemuDomainSecretInfoDestroy which clears only the secrets and not the
alias. The same function is used also for handling disk secrets.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4a2daffc0a..26f70238ed 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1221,8 +1221,8 @@ qemuDomainSecretHostdevDestroy(virDomainHostdevDefPtr hostdev)
 
         if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
             srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src);
-            if (srcPriv && srcPriv->secinfo)
-                g_clear_pointer(&srcPriv->secinfo, qemuDomainSecretInfoFree);
+            if (srcPriv)
+                qemuDomainSecretInfoDestroy(srcPriv->secinfo);
         }
     }
 }