[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] Fix pci_add storage not to exit on bad first ar
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 2/6] Fix pci_add storage not to exit on bad first argument |
Date: |
Fri, 25 Sep 2009 03:53:49 +0200 |
Monitor command "pci_add ADDR storage ..." does its work in
qemu_pci_hot_add_nic(). It called pci_create(..., ADDR) to create the
device. That's wrong, because pci_create() terminates the program
when ADDR is invalid.
Use pci_get_bus_devfn() and pci_create_noinit() instead.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/pci-hotplug.c | 12 ++++++++++--
hw/pci.c | 2 +-
hw/pci.h | 1 +
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index f3dc421..d6093ba 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -107,6 +107,8 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
DriveInfo *dinfo = NULL;
int type = -1;
char buf[128];
+ PCIBus *bus;
+ int devfn;
if (get_param_value(buf, sizeof(buf), "if", opts)) {
if (!strcmp(buf, "scsi"))
@@ -134,16 +136,22 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
dinfo = NULL;
}
+ bus = pci_get_bus_devfn(&devfn, devaddr);
+ if (!bus) {
+ monitor_printf(mon, "Invalid PCI device address %s\n", devaddr);
+ return NULL;
+ }
+
switch (type) {
case IF_SCSI:
- dev = pci_create("lsi53c895a", devaddr);
+ dev = pci_create_noinit(bus, devfn, "lsi53c895a");
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);
+ dev = pci_create_noinit(bus, devfn, "virtio-blk-pci");
qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
break;
default:
diff --git a/hw/pci.c b/hw/pci.c
index 64d70ed..5be21d7 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -265,7 +265,7 @@ int pci_read_devaddr(Monitor *mon, const char *addr, int
*domp, int *busp,
return 0;
}
-static PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr)
+PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr)
{
int dom, bus;
unsigned slot;
diff --git a/hw/pci.h b/hw/pci.h
index caba5c8..356405e 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -260,6 +260,7 @@ int pci_bus_num(PCIBus *s);
void pci_for_each_device(int bus_num, void (*fn)(PCIDevice *d));
PCIBus *pci_find_bus(int bus_num);
PCIDevice *pci_find_device(int bus_num, int slot, int function);
+PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr);
int pci_read_devaddr(Monitor *mon, const char *addr, int *domp, int *busp,
unsigned *slotp);
--
1.6.2.5
- [Qemu-devel] [PATCH 0/6] Fix pci_add not to exit on error & other fixes, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 2/6] Fix pci_add storage not to exit on bad first argument,
Markus Armbruster <=
- [Qemu-devel] [PATCH 1/6] Fix pci_vga_init() not to ignore bus argument, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 6/6] Rename pci_create_noinit() to pci_create(), Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 4/6] Fix pci_add nic not to exit on bad model, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 3/6] Make it obvious that pci_nic_init() can't fail, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 5/6] pci_create() is now unused, remove it, Markus Armbruster, 2009/09/24
- Re: [Qemu-devel] [PATCH 0/6] Fix pci_add not to exit on error & other fixes, Gerd Hoffmann, 2009/09/25
- Re: [Qemu-devel] [PATCH 0/6] Fix pci_add not to exit on error & other fixes, Luiz Capitulino, 2009/09/25
- Re: [Qemu-devel] [PATCH 0/6] Fix pci_add not to exit on error & other fixes, Mark McLoughlin, 2009/09/28