From 3ea7eb40ba5a813e954a13b316e7eaeab42dbd32 Mon Sep 17 00:00:00 2001 From: Shivaprasad G Bhat Date: Tue, 30 May 2017 16:52:17 +0530 Subject: [PATCH] qemu: Release address for redirected device hotplug attach failure The virDomainUSBAddressEnsure returns 0 or -1, so commit id 'de325472' checking for 1 like qemuDomainAttachChrDeviceAssignAddr was wrong. Signed-off-by: Shivaprasad G Bhat --- src/qemu/qemu_hotplug.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d46956d983..1f5cca9717 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -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;