]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: domain: Destroy secrets for complete backing chain
authorPeter Krempa <pkrempa@redhat.com>
Fri, 20 Oct 2017 12:16:28 +0000 (14:16 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 3 Nov 2017 09:23:21 +0000 (10:23 +0100)
src/qemu/qemu_domain.c

index 7ac0d78fe53dcca6b8e70337b4f704949b32d3c4..adc8ebbd1964ed07e0a91fd7fd2ee86143457d86 100644 (file)
@@ -1325,6 +1325,19 @@ qemuDomainSecretInfoTLSNew(virConnectPtr conn,
 }
 
 
+static void
+qemuDomainSecretStorageSourceDestroy(virStorageSourcePtr src)
+{
+    qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
+
+    if (srcPriv && srcPriv->secinfo)
+        qemuDomainSecretInfoFree(&srcPriv->secinfo);
+
+    if (srcPriv && srcPriv->encinfo)
+        qemuDomainSecretInfoFree(&srcPriv->encinfo);
+}
+
+
 /* qemuDomainSecretDiskDestroy:
  * @disk: Pointer to a disk definition
  *
@@ -1333,13 +1346,10 @@ qemuDomainSecretInfoTLSNew(virConnectPtr conn,
 void
 qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk)
 {
-    qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);
-
-    if (srcPriv && srcPriv->secinfo)
-        qemuDomainSecretInfoFree(&srcPriv->secinfo);
+    virStorageSourcePtr next;
 
-    if (srcPriv && srcPriv->encinfo)
-        qemuDomainSecretInfoFree(&srcPriv->encinfo);
+    for (next = disk->src; virStorageSourceIsBacking(next); next = next->backingStore)
+        qemuDomainSecretStorageSourceDestroy(next);
 }