From 7432ff5d6b70b58d6d3d9417cf87d2fe9ba2ce6c Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 23 Aug 2009 06:12:54 +0000 Subject: Rearrange to suppress gcc 3.3.5 warning about unused variable Signed-off-by: Blue Swirl --- hw/pci-hotplug.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'hw/pci-hotplug.c') diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 4da916cca1..1f92e09f87 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; -- cgit v1.2.3