From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmTF2-0000J9-Ac for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:19:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmTF0-0004X1-EN for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:19:51 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 4 Jul 2012 19:19:28 +0200 Message-Id: <1341422373-13614-10-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 09/14] prep_pci: QOM'ify Raven PCI host bridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, jbaron@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:PReP" , anthony@codemonkey.ws, pbonzini@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Introduce type constant and cast macro. Avoid accessing parent fields directly. Also add missing space and braces. Signed-off-by: Andreas F=C3=A4rber --- hw/prep_pci.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/prep_pci.c b/hw/prep_pci.c index a8cdc21..69c19df 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -28,8 +28,14 @@ #include "pc.h" #include "exec-memory.h" =20 +#define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost" + +#define RAVEN_PCI_HOST_BRIDGE(obj) \ + OBJECT_CHECK(PREPPCIState, (obj), TYPE_RAVEN_PCI_HOST_BRIDGE) + typedef struct PRePPCIState { PCIHostState host_state; + MemoryRegion intack; qemu_irq irq[4]; } PREPPCIState; @@ -42,9 +48,10 @@ static inline uint32_t PPC_PCIIO_config(target_phys_ad= dr_t addr) { int i; =20 - for(i =3D 0; i < 11; i++) { - if ((addr & (1 << (11 + i))) !=3D 0) + for (i =3D 0; i < 11; i++) { + if ((addr & (1 << (11 + i))) !=3D 0) { break; + } } return (addr & 0x7ff) | (i << 11); } @@ -97,7 +104,7 @@ static void prep_set_irq(void *opaque, int irq_num, in= t level) static int raven_pcihost_init(SysBusDevice *dev) { PCIHostState *h =3D FROM_SYSBUS(PCIHostState, dev); - PREPPCIState *s =3D DO_UPCAST(PREPPCIState, host_state, h); + PREPPCIState *s =3D RAVEN_PCI_HOST_BRIDGE(dev); MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *address_space_io =3D get_system_io(); PCIBus *bus; @@ -107,7 +114,7 @@ static int raven_pcihost_init(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq[i]); } =20 - bus =3D pci_register_bus(&h->busdev.qdev, NULL, + bus =3D pci_register_bus(DEVICE(dev), NULL, prep_set_irq, prep_map_irq, s->irq, address_space_mem, address_space_io, 0, 4); h->bus =3D bus; @@ -184,7 +191,7 @@ static void raven_pcihost_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo raven_pcihost_info =3D { - .name =3D "raven-pcihost", + .name =3D TYPE_RAVEN_PCI_HOST_BRIDGE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PREPPCIState), .class_init =3D raven_pcihost_class_init, --=20 1.7.7