]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: hotplug: Remove wrong check for empty disks
authorPeter Krempa <pkrempa@redhat.com>
Wed, 18 Oct 2017 13:49:41 +0000 (15:49 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 19 Oct 2017 12:50:50 +0000 (14:50 +0200)
The check if the disk is empty is wrong and would spuriously reject NBD
sources. Remove it.

src/qemu/qemu_hotplug.c

index 1a0844701ff360e3098e784932f7e9828dd2af49..6bec69a5db6e13f6958248645fdb8a33a9634f81 100644 (file)
@@ -766,7 +766,6 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr driver,
     char *devstr = NULL;
     bool driveAdded = false;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-    const char *src = virDomainDiskGetSource(disk);
     bool releaseaddr = false;
 
     if (priv->usbaddrs) {
@@ -778,13 +777,6 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr driver,
     if (qemuDomainPrepareDisk(driver, vm, disk, NULL, false) < 0)
         goto cleanup;
 
-    /* XXX not correct once we allow attaching a USB CDROM */
-    if (!src) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("disk source path is missing"));
-        goto error;
-    }
-
     if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
         goto error;