From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 23 Aug 2009 06:12:54 +0000 (+0000)
Subject: Rearrange to suppress gcc 3.3.5 warning about unused variable
X-Git-Tag: v0.12.0-rc0~1538^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7432ff5d6b70b58d6d3d9417cf87d2fe9ba2ce6c;p=thirdparty%2Fqemu.git

Rearrange to suppress gcc 3.3.5 warning about unused variable

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 4da916cca18..1f92e09f871 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -125,9 +125,8 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
             monitor_printf(mon, "Parameter addr not supported\n");
             return NULL;
         }
-    } else if (type == IF_VIRTIO) {
-        monitor_printf(mon, "virtio requires a backing file/device.\n");
-        return NULL;
+    } else {
+        dinfo = NULL;
     }
 
     switch (type) {
@@ -135,6 +134,10 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
         dev = pci_create("lsi53c895a", devaddr);
         break;
     case IF_VIRTIO:
+        if (!dinfo) {
+            monitor_printf(mon, "virtio requires a backing file/device.\n");
+            return NULL;
+        }
         dev = pci_create("virtio-blk-pci", devaddr);
         qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
         break;