From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmTEz-0000BH-R7 for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:19:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmTEx-0004Vn-NA for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:19:49 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47795 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmTEx-0004VS-Db for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:19:47 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 4 Jul 2012 19:19:26 +0200 Message-Id: <1341422373-13614-8-git-send-email-afaerber@suse.de> In-Reply-To: <1341422373-13614-1-git-send-email-afaerber@suse.de> References: <1341422373-13614-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] [PATCH v3 07/14] ppc4xx_pci: QOM'ify ppc4xx PCI host bridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, jbaron@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws, mst@redhat.com Introduce type constant and cast macro. Avoid accessing its parent field directly. Signed-off-by: Andreas F=C3=A4rber --- hw/ppc440_bamboo.c | 3 ++- hw/ppc4xx.h | 2 ++ hw/ppc4xx_pci.c | 13 ++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 0dd4dab..c198071 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -216,7 +216,8 @@ static void bamboo_init(ram_addr_t ram_size, ram_bases, ram_sizes, 1); =20 /* PCI */ - dev =3D sysbus_create_varargs("ppc4xx-pcihost", PPC440EP_PCI_CONFIG, + dev =3D sysbus_create_varargs(TYPE_PPC4xx_PCI_HOST_BRIDGE, + PPC440EP_PCI_CONFIG, pic[pci_irq_nrs[0]], pic[pci_irq_nrs[1]]= , pic[pci_irq_nrs[2]], pic[pci_irq_nrs[3]]= , NULL); diff --git a/hw/ppc4xx.h b/hw/ppc4xx.h index b511020..5cd78b6 100644 --- a/hw/ppc4xx.h +++ b/hw/ppc4xx.h @@ -53,6 +53,8 @@ void ppc4xx_sdram_init (CPUPPCState *env, qemu_irq irq,= int nbanks, target_phys_addr_t *ram_sizes, int do_init); =20 +#define TYPE_PPC4xx_PCI_HOST_BRIDGE "ppc4xx-pcihost" + PCIBus *ppc4xx_pci_init(CPUPPCState *env, qemu_irq pci_irqs[4], target_phys_addr_t config_space, target_phys_addr_t int_ack, diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index 104ed98..599a75a 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c @@ -45,6 +45,9 @@ struct PCITargetMap { uint32_t la; }; =20 +#define PPC4xx_PCI_HOST_BRIDGE(obj) \ + OBJECT_CHECK(PPC4xxPCIState, (obj), TYPE_PPC4xx_PCI_HOST_BRIDGE) + #define PPC4xx_PCI_NR_PMMS 3 #define PPC4xx_PCI_NR_PTMS 2 =20 @@ -335,17 +338,17 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev) PCIBus *b; int i; =20 - h =3D FROM_SYSBUS(PCIHostState, sysbus_from_qdev(dev)); - s =3D DO_UPCAST(PPC4xxPCIState, pci_state, h); + h =3D FROM_SYSBUS(PCIHostState, dev); + s =3D PPC4xx_PCI_HOST_BRIDGE(dev); =20 for (i =3D 0; i < ARRAY_SIZE(s->irq); i++) { sysbus_init_irq(dev, &s->irq[i]); } =20 - b =3D pci_register_bus(&s->pci_state.busdev.qdev, NULL, ppc4xx_pci_s= et_irq, + b =3D pci_register_bus(DEVICE(dev), NULL, ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, s->irq, get_system_memory()= , get_system_io(), 0, 4); - s->pci_state.bus =3D b; + h->bus =3D b; =20 pci_create_simple(b, 0, "ppc4xx-host-bridge"); =20 @@ -394,7 +397,7 @@ static void ppc4xx_pcihost_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo ppc4xx_pcihost_info =3D { - .name =3D "ppc4xx-pcihost", + .name =3D TYPE_PPC4xx_PCI_HOST_BRIDGE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PPC4xxPCIState), .class_init =3D ppc4xx_pcihost_class_init, --=20 1.7.7