]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu_hotplug: remove another erroneous qemuDomainDetachExtensionDevice() call
authorLaine Stump <laine@laine.org>
Tue, 19 Mar 2019 22:55:15 +0000 (18:55 -0400)
committerLaine Stump <laine@laine.org>
Mon, 25 Mar 2019 16:34:17 +0000 (12:34 -0400)
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 <laine@laine.org>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
src/qemu/qemu_hotplug.c

index 18075dc48ef5d9cbe2723fe8459e5e4d31093e7e..65ec5187e645cb4243d01116d732cdc0f200801c 100644 (file)
@@ -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;