mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
qemu: Split up qemuDomainRemoveInactive
Introduce qemuDomainRemoveInactiveJobCommon to handle what will be the common parts of the code with a new function that will be used to call virDomainObjListRemoveLocked instead of the unlocked variant. Signed-off-by: Wang Yechao <wang.yechao255@zte.com.cn> Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
5095394e1e
commit
6901a9321d
@ -8344,23 +8344,13 @@ qemuDomainSnapshotDiscardAllMetadata(virQEMUDriverPtr driver,
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* qemuDomainRemoveInactive:
|
||||
*
|
||||
* The caller must hold a lock to the vm.
|
||||
*/
|
||||
void
|
||||
qemuDomainRemoveInactive(virQEMUDriverPtr driver,
|
||||
virDomainObjPtr vm)
|
||||
static void
|
||||
qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver,
|
||||
virDomainObjPtr vm)
|
||||
{
|
||||
char *snapDir;
|
||||
virQEMUDriverConfigPtr cfg;
|
||||
|
||||
if (vm->persistent) {
|
||||
/* Short-circuit, we don't want to remove a persistent domain */
|
||||
return;
|
||||
}
|
||||
|
||||
cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
/* Remove any snapshot metadata prior to removing the domain */
|
||||
@ -8379,12 +8369,30 @@ qemuDomainRemoveInactive(virQEMUDriverPtr driver,
|
||||
}
|
||||
qemuExtDevicesCleanupHost(driver, vm->def);
|
||||
|
||||
virDomainObjListRemove(driver->domains, vm);
|
||||
|
||||
virObjectUnref(cfg);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* qemuDomainRemoveInactive:
|
||||
*
|
||||
* The caller must hold a lock to the vm.
|
||||
*/
|
||||
void
|
||||
qemuDomainRemoveInactive(virQEMUDriverPtr driver,
|
||||
virDomainObjPtr vm)
|
||||
{
|
||||
if (vm->persistent) {
|
||||
/* Short-circuit, we don't want to remove a persistent domain */
|
||||
return;
|
||||
}
|
||||
|
||||
qemuDomainRemoveInactiveCommon(driver, vm);
|
||||
|
||||
virDomainObjListRemove(driver->domains, vm);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* qemuDomainRemoveInactiveJob:
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user