From 1f5f6638c063514f193ca447d49fa95f8a574a69 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 18 Jun 2009 15:14:09 +0200 Subject: Make first argument of monitor command pci_add work Simply pass the PCI address through qemu_pci_hot_add_nic() to pci_nic_init() and through qemu_pci_hot_add_storage() to pci_create(). Before, pci_device_hot_add() passed along the PCI bus to use, and ignored any user-specified slot. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- hw/pci.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'hw/pci.c') diff --git a/hw/pci.c b/hw/pci.c index 260f75e269..f2d7daf3e8 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -237,23 +237,6 @@ int pci_read_devaddr(const char *addr, int *domp, int *busp, unsigned *slotp) return pci_parse_devaddr(devaddr, domp, busp, slotp); } -int pci_assign_devaddr(const char *addr, int *domp, int *busp, unsigned *slotp) -{ - char devaddr[32]; - - if (!get_param_value(devaddr, sizeof(devaddr), "pci_addr", addr)) - return -1; - - if (!strcmp(devaddr, "auto")) { - *domp = *busp = 0; - *slotp = -1; - /* want to support dom/bus auto-assign at some point */ - return 0; - } - - return pci_parse_devaddr(devaddr, domp, busp, slotp); -} - static PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr) { int dom, bus; @@ -820,7 +803,7 @@ void pci_info(Monitor *mon) pci_for_each_device(0, pci_info_device); } -static PCIDevice *pci_create(const char *name, const char *devaddr) +PCIDevice *pci_create(const char *name, const char *devaddr) { PCIBus *bus; int devfn; -- cgit 1.4.1