diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-08-23 20:23:55 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-08-30 20:14:39 +0200 |
| commit | dd301ca607feddab3b44f927cd36aee004c40e1a (patch) | |
| tree | ff69c5b63acf77912f4957fccf1bda21e741e147 | |
| parent | c6baf942e084e0bc40ee37c8d8672ac9c5ea270b (diff) | |
| download | qemu-dd301ca607feddab3b44f927cd36aee004c40e1a.zip qemu-dd301ca607feddab3b44f927cd36aee004c40e1a.tar.gz qemu-dd301ca607feddab3b44f927cd36aee004c40e1a.tar.bz2 | |
pci: Pass size to pci_bus_new_inplace()
To be passed to qbus_create_inplace().
Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/pci-host/prep.c | 2 | ||||
| -rw-r--r-- | hw/pci-host/versatile.c | 2 | ||||
| -rw-r--r-- | hw/pci/pci.c | 2 | ||||
| -rw-r--r-- | include/hw/pci/pci.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index e120058..a62236b 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -155,7 +155,7 @@ static void raven_pcihost_initfn(Object *obj) MemoryRegion *address_space_io = get_system_io(); DeviceState *pci_dev; - pci_bus_new_inplace(&s->pci_bus, DEVICE(obj), NULL, + pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), NULL, address_space_mem, address_space_io, 0, TYPE_PCI_BUS); h->bus = &s->pci_bus; diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 9238d39..4b9359c 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -384,7 +384,7 @@ static void pci_vpb_init(Object *obj) memory_region_init(&s->pci_io_space, OBJECT(s), "pci_io", 1ULL << 32); memory_region_init(&s->pci_mem_space, OBJECT(s), "pci_mem", 1ULL << 32); - pci_bus_new_inplace(&s->pci_bus, DEVICE(obj), "pci", + pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), "pci", &s->pci_mem_space, &s->pci_io_space, PCI_DEVFN(11, 0), TYPE_PCI_BUS); h->bus = &s->pci_bus; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 4c004f5..397555c 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -312,7 +312,7 @@ bool pci_bus_is_root(PCIBus *bus) return !bus->parent_dev; } -void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, +void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, DeviceState *parent, const char *name, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index ccec2ba..051b6ed 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -348,7 +348,7 @@ typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev, bool pci_bus_is_express(PCIBus *bus); bool pci_bus_is_root(PCIBus *bus); -void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, +void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, DeviceState *parent, const char *name, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, |