From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmTF3-0000LO-19 for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:19:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmTF1-0004XK-9p for qemu-devel@nongnu.org; Wed, 04 Jul 2012 13:19:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47807 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmTF1-0004Wp-09 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:29 +0200 Message-Id: <1341422373-13614-11-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 10/14] spapr_pci: QOM'ify sPAPR 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. Introduce cast macro to drop bogus busdev field that would've broken SYS_BUS_DEVICE(). Signed-off-by: Andreas F=C3=A4rber Reviewed-by: Anthony Liguori --- hw/spapr_pci.c | 8 ++++---- hw/spapr_pci.h | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index 0e0830f..dd2a72d 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -276,7 +276,7 @@ static DMAContext *spapr_pci_dma_context_fn(PCIBus *b= us, void *opaque, =20 static int spapr_phb_init(SysBusDevice *s) { - sPAPRPHBState *phb =3D FROM_SYSBUS(sPAPRPHBState, s); + sPAPRPHBState *phb =3D SPAPR_PCI_HOST_BRIDGE(s); char *namebuf; int i; PCIBus *bus; @@ -314,7 +314,7 @@ static int spapr_phb_init(SysBusDevice *s) memory_region_add_subregion(get_system_memory(), phb->io_win_addr, &phb->iowindow); =20 - bus =3D pci_register_bus(&phb->busdev.qdev, + bus =3D pci_register_bus(DEVICE(s), phb->busname ? phb->busname : phb->dtbusname, pci_spapr_set_irq, pci_spapr_map_irq, phb, &phb->memspace, &phb->iospace, @@ -369,7 +369,7 @@ static void spapr_phb_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo spapr_phb_info =3D { - .name =3D "spapr-pci-host-bridge", + .name =3D TYPE_SPAPR_PCI_HOST_BRIDGE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(sPAPRPHBState), .class_init =3D spapr_phb_class_init, @@ -382,7 +382,7 @@ void spapr_create_phb(sPAPREnvironment *spapr, { DeviceState *dev; =20 - dev =3D qdev_create(NULL, spapr_phb_info.name); + dev =3D qdev_create(NULL, TYPE_SPAPR_PCI_HOST_BRIDGE); =20 if (busname) { qdev_prop_set_string(dev, "busname", g_strdup(busname)); diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h index d9e46e2..06e2742 100644 --- a/hw/spapr_pci.h +++ b/hw/spapr_pci.h @@ -27,8 +27,12 @@ #include "hw/pci_host.h" #include "hw/xics.h" =20 +#define TYPE_SPAPR_PCI_HOST_BRIDGE "spapr-pci-host-bridge" + +#define SPAPR_PCI_HOST_BRIDGE(obj) \ + OBJECT_CHECK(sPAPRPHBState, (obj), TYPE_SPAPR_PCI_HOST_BRIDGE) + typedef struct sPAPRPHBState { - SysBusDevice busdev; PCIHostState host_state; =20 uint64_t buid; --=20 1.7.7