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

qemuDomainRemoveChrDevice: Deal with qemuDomainChrRemove() failure

Browse Source 
When cleaning up after removed device, qemuDomainChrRemove() is
called. But this may fail, in which case we successfully ignore
the failure and virDomainChrDefFree() the device anyway. While it
decreases our memory consumption, it's a bit too far, especially
if the next step is 'virsh dumpxml'. Then our memory consumption
decreases all the way down to zero as we crash.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2023-04-12 10:22:42 +02:00
parent fc8320faef
commit b5a591f73b
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_hotplug.c
View File

@ -4695,6 +4695,7 @@ qemuDomainRemoveChrDevice(virQEMUDriver *driver,
virObjectEvent *event;
g_autofree char *charAlias = NULL;
qemuDomainObjPrivate *priv = vm->privateData;
virDomainChrDef *chrRemoved = NULL;
int rc = 0;
VIR_DEBUG("Removing character device %s from domain %p %s",
@ -4728,17 +4729,24 @@ qemuDomainRemoveChrDevice(virQEMUDriver *driver,
if (qemuDomainNamespaceTeardownChardev(vm, chr) < 0)
VIR_WARN("Unable to remove chr device from /dev");
qemuDomainReleaseDeviceAddress(vm, &chr->info);
qemuDomainChrRemove(vm->def, chr);
if (!(chrRemoved = qemuDomainChrRemove(vm->def, chr))) {
/* At this point, we only have bad options. The device
* was successfully removed from QEMU, denied in CGropus,
* etc. and yet, we failed to remove it from domain
* definition. */
VIR_WARN("Unable to remove chr device from domain definition");
} else {
qemuDomainReleaseDeviceAddress(vm, &chrRemoved->info);
/* The caller does not emit the event, so we must do it here. Note
* that the event should be reported only after all backend
* teardown is completed.
*/
event = virDomainEventDeviceRemovedNewFromObj(vm, chr->info.alias);
virObjectEventStateQueue(driver->domainEventState, event);
/* The caller does not emit the event, so we must do it here. Note
* that the event should be reported only after all backend
* teardown is completed.
*/
event = virDomainEventDeviceRemovedNewFromObj(vm, chrRemoved->info.alias);
virObjectEventStateQueue(driver->domainEventState, event);
virDomainChrDefFree(chr);
virDomainChrDefFree(chrRemoved);
}
return 0;
}