From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 28 Mar 2019 12:19:59 +0000 (+0100)
Subject: qemu: hotplug: Don't release USB address twice when removing disk
X-Git-Tag: v5.2.0-rc2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbd15d6c450872c0db8132945e05834eff639039;p=thirdparty%2Flibvirt.git

qemu: hotplug: Don't release USB address twice when removing disk

qemuDomainRemoveDiskDevice calls qemuDomainReleaseDeviceAddress which
already calls virDomainUSBAddressRelease so we don't need to call it
again.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index ee1ad05814..ae9cafa0da 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4516,7 +4516,6 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
     dev.type = VIR_DOMAIN_DEVICE_DISK;
     dev.data.disk = disk;
     ignore_value(qemuRemoveSharedDevice(driver, &dev, vm->def->name));
-    virDomainUSBAddressRelease(priv->usbaddrs, &disk->info);
 
     if (qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)
         goto cleanup;