]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Release address for redirected device hotplug attach failure
authorShivaprasad G Bhat <sbhat@linux.vnet.ibm.com>
Tue, 30 May 2017 11:22:17 +0000 (16:52 +0530)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 12 Jun 2017 13:02:18 +0000 (09:02 -0400)
The virDomainUSBAddressEnsure returns 0 or -1, so commit id 'de325472'
checking for 1 like qemuDomainAttachChrDeviceAssignAddr was wrong.

Signed-off-by: Shivaprasad G Bhat <sbhat@linux.vnet.ibm.com>
src/qemu/qemu_hotplug.c

index d46956d98386d5931c01f5abb561fc17bf40a30b..1f5cca971722c1743d3b5580ad82cd94f009b2f6 100644 (file)
@@ -1711,7 +1711,6 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn,
                                    virDomainRedirdevDefPtr redirdev)
 {
     int ret = -1;
-    int rc;
     qemuDomainObjPrivatePtr priv = vm->privateData;
     virDomainDefPtr def = vm->def;
     char *charAlias = NULL;
@@ -1728,10 +1727,9 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn,
     if (!(charAlias = qemuAliasChardevFromDevAlias(redirdev->info.alias)))
         goto cleanup;
 
-    if ((rc = virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0)
+    if ((virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0)
         goto cleanup;
-    if (rc == 1)
-        need_release = true;
+    need_release = true;
 
     if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps)))
         goto cleanup;