david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pci_add storage: fix error handling for 'if' parameter (Eduardo Habkost)

Browse Source 
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 <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6981 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-04-05 17:40:55 +00:00
parent 016c62c81b
commit 8707eccac8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/pci-hotplug.c
View File

@ -97,19 +97,22 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, PCIBus *pci_bus,
type = IF_SCSI; type = IF_SCSI;
else if (!strcmp(buf, "virtio")) { else if (!strcmp(buf, "virtio")) {
type = IF_VIRTIO; type = IF_VIRTIO;
} else {
monitor_printf(mon, "type %s not a hotpluggable PCI device.\n", buf);
goto out;
} }
} else { } else {
monitor_printf(mon, "no if= specified\n"); monitor_printf(mon, "no if= specified\n");
return NULL; goto out;
} }
if (get_param_value(buf, sizeof(buf), "file", opts)) { if (get_param_value(buf, sizeof(buf), "file", opts)) {
drive_idx = add_init_drive(opts); drive_idx = add_init_drive(opts);
if (drive_idx < 0) if (drive_idx < 0)
return NULL; goto out;
} else if (type == IF_VIRTIO) { } else if (type == IF_VIRTIO) {
monitor_printf(mon, "virtio requires a backing file/device.\n"); monitor_printf(mon, "virtio requires a backing file/device.\n");
return NULL; goto out;
} }
switch (type) { switch (type) {
@ -122,10 +125,9 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, PCIBus *pci_bus,
case IF_VIRTIO: case IF_VIRTIO:
opaque = virtio_blk_init (pci_bus, drives_table[drive_idx].bdrv); opaque = virtio_blk_init (pci_bus, drives_table[drive_idx].bdrv);
break; break;
default:
monitor_printf(mon, "type %s not a hotpluggable PCI device.\n", buf);
} }
out:
return opaque; return opaque;
} }