External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-06 22:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Introduce qemuDomainStartupCleanup

Browse Source 
The new helper qemuDomainStartupCleanup is used to perform cleanup after
a startup of a VM (successful or not). The initial implementation just
calls qemuDomainSecretDestroy, which can be un-exported.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2023-01-05 15:07:38 +01:00
parent 98bd201678
commit 4c9ce062d3
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_domain.c
View File

@ -1576,7 +1576,7 @@ qemuDomainSecretGraphicsPrepare(virQEMUDriverConfig *cfg,
* *
* Removes all unnecessary data which was needed to generate 'secret' objects. * Removes all unnecessary data which was needed to generate 'secret' objects.
*/ */
void static void
qemuDomainSecretDestroy(virDomainObj *vm) qemuDomainSecretDestroy(virDomainObj *vm)
{ {
size_t i; size_t i;
@ -12211,3 +12211,16 @@ qemuDomainSchedCoreStop(qemuDomainObjPrivate *priv)
priv->schedCoreChildPID = -1; priv->schedCoreChildPID = -1;
} }
} }
/**
* qemuDomainStartupCleanup:
*
* Performs a cleanup of data which is not required after a startup of a VM
* (successful or not).
*/
void
qemuDomainStartupCleanup(virDomainObj *vm)
{
qemuDomainSecretDestroy(vm);
}

3
src/qemu/qemu_domain.h
View File

@ -925,8 +925,7 @@ int qemuDomainSecretChardevPrepare(virQEMUDriverConfig *cfg,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(4);
void qemuDomainSecretDestroy(virDomainObj *vm) void qemuDomainStartupCleanup(virDomainObj *vm);
ATTRIBUTE_NONNULL(1);
int qemuDomainSecretPrepare(virQEMUDriver *driver, int qemuDomainSecretPrepare(virQEMUDriver *driver,
virDomainObj *vm) virDomainObj *vm)

2
src/qemu/qemu_process.c
View File

@ -7973,7 +7973,7 @@ qemuProcessLaunch(virConnectPtr conn,
cleanup: cleanup:
qemuDomainSchedCoreStop(priv); qemuDomainSchedCoreStop(priv);
qemuDomainSecretDestroy(vm); qemuDomainStartupCleanup(vm);
return ret; return ret;
} }