]> xenbits.xensource.com Git - libvirt.git/commitdiff
Revert f5a6ce44ce8368d4183b69a31b77f67688d9af43
authorJim Meyering <meyering@redhat.com>
Mon, 15 Mar 2010 15:43:23 +0000 (16:43 +0100)
committerJim Meyering <meyering@redhat.com>
Mon, 15 Mar 2010 17:24:38 +0000 (18:24 +0100)
* src/qemu/qemu_driver.c (qemudDomainAttachSCSIDisk): The ".controller"
member is an index, and *may* be 0.  As such, the commit that we're
reverting broke SCSI disk hot-plug on controller 0.
Reported by Wolfgang Mauerer.

src/qemu/qemu_driver.c

index b17d26dd9d076c92bdadaa5cf0577e947c89ce9b..c8f3a1521495fa6cebd12c1d0d17f8f1709c9e39 100644 (file)
@@ -6080,12 +6080,6 @@ static int qemudDomainAttachSCSIDisk(struct qemud_driver *driver,
     if (!(drivestr = qemuBuildDriveStr(disk, 0, qemuCmdFlags)))
         goto error;
 
-    if (disk->info.addr.drive.controller <= 0) {
-        qemuReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("no drive controller for %s"), disk->dst);
-        goto error;
-    }
-
     for (i = 0 ; i <= disk->info.addr.drive.controller ; i++) {
         cont = qemuDomainFindOrCreateSCSIDiskController(driver, vm, i, qemuCmdFlags);
         if (!cont)