From 937e9a1c83cab9995778ed2037663948725b7079 Mon Sep 17 00:00:00 2001 From: aliguori Date: Sun, 5 Apr 2009 18:16:04 +0000 Subject: pci_add storage: fix error handling for 'if' parameter (Eduardo Habkost) This fixes: - The error message to show the actual if= argument value. It was showing the filename instead, because 'buf' is reaused on the filename parsing. - A bug that makes a block device to be created even when an unsupported if= arg is passed to pci_add. Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6987 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/pci-hotplug.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 628676444e..fa3a5e0932 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -95,19 +95,22 @@ static PCIDevice *qemu_pci_hot_add_storage(PCIBus *pci_bus, const char *opts) type = IF_SCSI; else if (!strcmp(buf, "virtio")) { type = IF_VIRTIO; + } else { + term_printf("type %s not a hotpluggable PCI device.\n", buf); + goto out; } } else { term_printf("no if= specified\n"); - return NULL; + goto out; } if (get_param_value(buf, sizeof(buf), "file", opts)) { drive_idx = add_init_drive(opts); if (drive_idx < 0) - return NULL; + goto out; } else if (type == IF_VIRTIO) { term_printf("virtio requires a backing file/device.\n"); - return NULL; + goto out; } switch (type) { @@ -120,10 +123,9 @@ static PCIDevice *qemu_pci_hot_add_storage(PCIBus *pci_bus, const char *opts) case IF_VIRTIO: opaque = virtio_blk_init (pci_bus, drives_table[drive_idx].bdrv); break; - default: - term_printf ("type %s not a hotpluggable PCI device.\n", buf); } +out: return opaque; } -- cgit v1.2.3