]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix crash on usb-serial hotplug
authorJán Tomko <jtomko@redhat.com>
Fri, 21 Oct 2016 12:23:54 +0000 (14:23 +0200)
committerJán Tomko <jtomko@redhat.com>
Thu, 27 Oct 2016 09:15:33 +0000 (11:15 +0200)
For domains with no USB address cache, we should not attempt
to generate a USB address.

https://bugzilla.redhat.com/show_bug.cgi?id=1387665

src/qemu/qemu_hotplug.c

index 69514bd2c3cda119add0480df3fafc6f888e35bf..0f59468587594f6d4eac136d7027c6003e1654c8 100644 (file)
@@ -1775,7 +1775,8 @@ qemuDomainAttachChrDeviceAssignAddr(virDomainObjPtr vm,
             return -1;
         return 1;
 
-    } else if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
+    } else if (priv->usbaddrs &&
+               chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
                chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB) {
         if (virDomainUSBAddressEnsure(priv->usbaddrs, &chr->info) < 0)
             return -1;