From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 7 Dec 2009 20:51:49 +0000 (+0000)
Subject: Fix backcompat for hotplug of SCSI controllers
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~9250
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec7efac4a967c650ae1cd8cebe28e7c69cbe3864;p=sdk%2Femulator%2Fqemu.git

Fix backcompat for hotplug of SCSI controllers

SCSI controllers have no trouble existing without any attached
disks. This could be achieved with the (legacy) monitor syntax

  pci_add pci_addr=auto storage if=scsi

This is now denied with

  scsi requires a backing file/device.
  failed to add if=scsi

There is no need for this denial and it breaks compatability
with existing QEMU usage, so remove the check for presence
of a drive.

  Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index f10c868..ba13d2b 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -199,14 +199,10 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
 
     switch (type) {
     case IF_SCSI:
-        if (!dinfo) {
-            monitor_printf(mon, "scsi requires a backing file/device.\n");
-            return NULL;
-        }
         dev = pci_create(bus, devfn, "lsi53c895a");
         if (qdev_init(&dev->qdev) < 0)
             dev = NULL;
-        if (dev) {
+        if (dev && dinfo) {
             if (scsi_hot_add(&dev->qdev, dinfo, 0) != 0) {
                 qdev_unplug(&dev->qdev);
                 dev = NULL;