External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Don't delete aliases of secret objects associated with disks

Browse Source 
We need to reference the secret objects by name when hot-unplugging
disks. Don't remove the alias so that it does not need to be
recalculated.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-05-28 15:31:42 +02:00
parent 02b031a475
commit 04c890cc8b
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/qemu/qemu_domain.c
View File

@ -1440,31 +1440,23 @@ qemuDomainSecretInfoTLSNew(qemuDomainObjPrivatePtr priv,
} }
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: /* qemuDomainSecretDiskDestroy:
* @disk: Pointer to a disk definition * @disk: Pointer to a disk definition
* *
* Clear and destroy memory associated with the secret * Clears unnecessary data associated with disk secret objects.
*/ */
void void
qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk) qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk)
{ {
virStorageSourcePtr next; qemuDomainStorageSourcePrivatePtr srcPriv;
virStorageSourcePtr n;
for (next = disk->src; virStorageSourceIsBacking(next); next = next->backingStore) for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
qemuDomainSecretStorageSourceDestroy(next); if ((srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(n))) {
qemuDomainSecretInfoDestroy(srcPriv->secinfo);
qemuDomainSecretInfoDestroy(srcPriv->encinfo);
}
}
} }
@ -1698,8 +1690,7 @@ qemuDomainSecretChardevPrepare(virQEMUDriverConfigPtr cfg,
/* qemuDomainSecretDestroy: /* qemuDomainSecretDestroy:
* @vm: Domain object * @vm: Domain object
* *
* Once completed with the generation of the command line it is * Removes all unnecessary data which was needed to generate 'secret' objects.
* expect to remove the secrets
*/ */
void void
qemuDomainSecretDestroy(virDomainObjPtr vm) qemuDomainSecretDestroy(virDomainObjPtr vm)