From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0xF7-00084H-83 for qemu-devel@nongnu.org; Mon, 13 Aug 2012 12:11:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0xF5-0003EC-Ri for qemu-devel@nongnu.org; Mon, 13 Aug 2012 12:11:49 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 13 Aug 2012 18:11:25 +0200 Message-Id: <1344874295-5619-5-git-send-email-afaerber@suse.de> In-Reply-To: <1344874295-5619-1-git-send-email-afaerber@suse.de> References: <1344874295-5619-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 for-1.2 v6 04/14] dec_pci: QOM'ify DEC 21154 PCI-PCI 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, Alexander Graf , "open list:New World" , anthony@codemonkey.ws, =?UTF-8?q?Andreas=20F=C3=A4rber?= , liwanp@linux.vnet.ibm.com Introduce type constant. Introduce cast macro and drop dummy busdev field used with FROM_SYSBUS() that would've broken SYS_BUS_DEVICE(). Avoid accessing parent fields directly. Signed-off-by: Andreas F=C3=A4rber Acked-by: Michael S. Tsirkin --- hw/dec_pci.c | 21 +++++++++++---------- hw/dec_pci.h | 2 ++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hw/dec_pci.c b/hw/dec_pci.c index 5194a9f..19aed1b 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -40,8 +40,9 @@ #define DEC_DPRINTF(fmt, ...) #endif =20 +#define DEC_21154(obj) OBJECT_CHECK(DECState, (obj), TYPE_DEC_21154) + typedef struct DECState { - SysBusDevice busdev; PCIHostState host_state; } DECState; =20 @@ -88,16 +89,16 @@ PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int de= vfn) =20 static int pci_dec_21154_device_init(SysBusDevice *dev) { - DECState *s; + PCIHostState *phb; =20 - s =3D FROM_SYSBUS(DECState, dev); + phb =3D FROM_SYSBUS(PCIHostState, dev); =20 - memory_region_init_io(&s->host_state.conf_mem, &pci_host_conf_le_ops= , - &s->host_state, "pci-conf-idx", 0x1000); - memory_region_init_io(&s->host_state.data_mem, &pci_host_data_le_ops= , - &s->host_state, "pci-data-idx", 0x1000); - sysbus_init_mmio(dev, &s->host_state.conf_mem); - sysbus_init_mmio(dev, &s->host_state.data_mem); + memory_region_init_io(&phb->conf_mem, &pci_host_conf_le_ops, + dev, "pci-conf-idx", 0x1000); + memory_region_init_io(&phb->data_mem, &pci_host_data_le_ops, + dev, "pci-data-idx", 0x1000); + sysbus_init_mmio(dev, &phb->conf_mem); + sysbus_init_mmio(dev, &phb->data_mem); return 0; } =20 @@ -134,7 +135,7 @@ static void pci_dec_21154_device_class_init(ObjectCla= ss *klass, void *data) } =20 static const TypeInfo pci_dec_21154_device_info =3D { - .name =3D "dec-21154-sysbus", + .name =3D TYPE_DEC_21154, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(DECState), .class_init =3D pci_dec_21154_device_class_init, diff --git a/hw/dec_pci.h b/hw/dec_pci.h index 79264ba..17dc0c2 100644 --- a/hw/dec_pci.h +++ b/hw/dec_pci.h @@ -3,6 +3,8 @@ =20 #include "qemu-common.h" =20 +#define TYPE_DEC_21154 "dec-21154-sysbus" + PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn); =20 #endif --=20 1.7.7