From: Jim Meyering <meyering@redhat.com>
Date: Mon, 15 Mar 2010 15:43:23 +0000 (+0100)
Subject: Revert f5a6ce44ce8368d4183b69a31b77f67688d9af43
X-Git-Tag: v0.8.0~291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c78c9f5a9bf4815734dd715a72d5c19c4874223e;p=thirdparty%2Flibvirt.git

Revert f5a6ce44ce8368d4183b69a31b77f67688d9af43

* 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.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b17d26dd9d..c8f3a15214 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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)