From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 18 Oct 2017 13:49:41 +0000 (+0200)
Subject: qemu: hotplug: Remove wrong check for empty disks
X-Git-Tag: v3.9.0-rc1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c01a2e057f51a44247698646c90a50277e0933ae;p=thirdparty%2Flibvirt.git

qemu: hotplug: Remove wrong check for empty disks

The check if the disk is empty is wrong and would spuriously reject NBD
sources. Remove it.
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 1a0844701f..6bec69a5db 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -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;