From: Laine Stump Date: Tue, 19 Mar 2019 22:55:15 +0000 (-0400) Subject: qemu_hotplug: remove another erroneous qemuDomainDetachExtensionDevice() call X-Git-Tag: v5.2.0-rc1~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e18e9b72a99f93cd4b14f39c60baa7c5ea35e5db;p=thirdparty%2Flibvirt.git qemu_hotplug: remove another erroneous qemuDomainDetachExtensionDevice() call qemuDomainRemoveRNGDevice() calls qemuDomainDetachExtensionDevice(). According to commit 1d1e264f1 that added this code, it should not be necessary to explicitly remove the zPCI extension device for a PCI device during unplug, because "QEMU implements an unplug callback which will unplug both PCI and zPCI device in a cascaded way". In fact, no other devices call qemuDomainDetachExtensionDevice() during their qemuDomainRemove*Device() function, so it should be removed from qemuDomainRemoveRNGDevice as well. Signed-off-by: Laine Stump Reviewed-by: Ján Tomko Reviewed-by: Boris Fiuczynski --- diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 18075dc48e..65ec5187e6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4884,9 +4884,6 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); - if (qemuDomainDetachExtensionDevice(priv->mon, &rng->info) < 0) - rc = -1; - if (rc == 0 && qemuMonitorDelObject(priv->mon, objAlias) < 0) rc = -1;