[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6981] pci_add storage: fix error handling for 'if' paramet
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6981] pci_add storage: fix error handling for 'if' parameter ( Eduardo Habkost) |
Date: |
Sun, 05 Apr 2009 17:40:55 +0000 |
Revision: 6981
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6981
Author: aliguori
Date: 2009-04-05 17:40:55 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/hw/pci-hotplug.c
Modified: trunk/hw/pci-hotplug.c
===================================================================
--- trunk/hw/pci-hotplug.c 2009-04-05 17:40:50 UTC (rev 6980)
+++ trunk/hw/pci-hotplug.c 2009-04-05 17:40:55 UTC (rev 6981)
@@ -97,19 +97,22 @@
type = IF_SCSI;
else if (!strcmp(buf, "virtio")) {
type = IF_VIRTIO;
+ } else {
+ monitor_printf(mon, "type %s not a hotpluggable PCI device.\n",
buf);
+ goto out;
}
} else {
monitor_printf(mon, "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) {
monitor_printf(mon, "virtio requires a backing file/device.\n");
- return NULL;
+ goto out;
}
switch (type) {
@@ -122,10 +125,9 @@
case IF_VIRTIO:
opaque = virtio_blk_init (pci_bus, drives_table[drive_idx].bdrv);
break;
- default:
- monitor_printf(mon, "type %s not a hotpluggable PCI device.\n", buf);
}
+out:
return opaque;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6981] pci_add storage: fix error handling for 'if' parameter ( Eduardo Habkost),
Anthony Liguori <=