From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFUOP-0005cF-6f 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 1VFUOH-00008u-PO for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:30:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54893 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFUOH-00008j-G6 for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:29:53 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 104C7A52D7 for ; Fri, 30 Aug 2013 21:29:53 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 30 Aug 2013 21:29:31 +0200 Message-Id: <1377890983-6481-6-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 05/17] ipack: Pass size to ipack_bus_new_inplace() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= To be passed to qbus_create_inplace(). Simplify DEVICE() cast to avoid parent field access. Reviewed-by: Wenchao Xia Signed-off-by: Andreas F=C3=A4rber --- hw/char/ipack.c | 3 ++- hw/char/ipack.h | 3 ++- hw/char/tpci200.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/char/ipack.c b/hw/char/ipack.c index f890471..5fb7073 100644 --- a/hw/char/ipack.c +++ b/hw/char/ipack.c @@ -24,7 +24,8 @@ IPackDevice *ipack_device_find(IPackBus *bus, int32_t s= lot) return NULL; } =20 -void ipack_bus_new_inplace(IPackBus *bus, DeviceState *parent, +void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size, + DeviceState *parent, const char *name, uint8_t n_slots, qemu_irq_handler handler) { diff --git a/hw/char/ipack.h b/hw/char/ipack.h index f2b7a12..f8dc0f2 100644 --- a/hw/char/ipack.h +++ b/hw/char/ipack.h @@ -72,7 +72,8 @@ extern const VMStateDescription vmstate_ipack_device; VMSTATE_STRUCT(_field, _state, 1, vmstate_ipack_device, IPackDevice) =20 IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot); -void ipack_bus_new_inplace(IPackBus *bus, DeviceState *parent, +void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size, + DeviceState *parent, const char *name, uint8_t n_slots, qemu_irq_handler handler); =20 diff --git a/hw/char/tpci200.c b/hw/char/tpci200.c index d9e17b2..e04ff26 100644 --- a/hw/char/tpci200.c +++ b/hw/char/tpci200.c @@ -607,7 +607,7 @@ static int tpci200_initfn(PCIDevice *pci_dev) pci_register_bar(&s->dev, 4, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las2= ); pci_register_bar(&s->dev, 5, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las3= ); =20 - ipack_bus_new_inplace(&s->bus, DEVICE(&s->dev), NULL, + ipack_bus_new_inplace(&s->bus, sizeof(s->bus), DEVICE(pci_dev), NULL= , N_MODULES, tpci200_set_irq); =20 return 0; --=20 1.8.1.4