From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFUOP-0005cP-N0 for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:30:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFUOJ-00009h-Iw for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:30:01 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 30 Aug 2013 21:29:33 +0200 Message-Id: <1377890983-6481-8-git-send-email-afaerber@suse.de> In-Reply-To: <1377890983-6481-1-git-send-email-afaerber@suse.de> References: <1377890983-6481-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 07/17] pci: Pass size to pci_bus_new_inplace() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Michael S. Tsirkin" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:PReP" , Paul Brook , =?UTF-8?q?Andreas=20F=C3=A4rber?= To be passed to qbus_create_inplace(). Reviewed-by: Wenchao Xia Signed-off-by: Andreas F=C3=A4rber --- hw/pci-host/prep.c | 2 +- hw/pci-host/versatile.c | 2 +- hw/pci/pci.c | 2 +- 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 =3D get_system_io(); DeviceState *pci_dev; =20 - pci_bus_new_inplace(&s->pci_bus, DEVICE(obj), NULL, + pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), NU= LL, address_space_mem, address_space_io, 0, TYPE_PCI= _BUS); h->bus =3D &s->pci_bus; =20 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); =20 - pci_bus_new_inplace(&s->pci_bus, DEVICE(obj), "pci", + pci_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), "p= ci", &s->pci_mem_space, &s->pci_io_space, PCI_DEVFN(11, 0), TYPE_PCI_BUS); h->bus =3D &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; } =20 -void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, +void pci_bus_new_inplace(PCIBus *bus, size_t bus_size, DeviceState *pare= nt, 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, PCID= evice *pci_dev, =20 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 *pare= nt, const char *name, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, --=20 1.8.1.4