Commit dd301ca6 authored by Andreas Färber's avatar Andreas Färber
Browse files

pci: Pass size to pci_bus_new_inplace() 



To be passed to qbus_create_inplace().

Reviewed-by: default avatarWenchao Xia <xiawenc@linux.vnet.ibm.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent c6baf942

hw/pci-host/prep.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

hw/pci-host/versatile.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

hw/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/hw/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -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,