From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0xFH-00007T-NS for qemu-devel@nongnu.org; Mon, 13 Aug 2012 12:12:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0xFE-0003HO-Dj for qemu-devel@nongnu.org; Mon, 13 Aug 2012 12:11:59 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 13 Aug 2012 18:11:32 +0200 Message-Id: <1344874295-5619-12-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 11/14] unin_pci: QOM'ify UniNorth PCI host bridges 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 constants and cast macros. Avoid accessing parent fields directly. Signed-off-by: Andreas F=C3=A4rber Acked-by: Michael S. Tsirkin --- hw/unin_pci.c | 133 ++++++++++++++++++++++++++++++---------------------= ------ 1 files changed, 70 insertions(+), 63 deletions(-) diff --git a/hw/unin_pci.c b/hw/unin_pci.c index 2b309df..1fc8920 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -38,8 +38,23 @@ =20 static const int unin_irq_line[] =3D { 0x1b, 0x1c, 0x1d, 0x1e }; =20 +#define TYPE_UNI_NORTH_PCI_HOST_BRIDGE "uni-north-pci-pcihost" +#define TYPE_UNI_NORTH_AGP_HOST_BRIDGE "uni-north-agp-pcihost" +#define TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE "uni-north-internal-pci-= pcihost" +#define TYPE_U3_AGP_HOST_BRIDGE "u3-agp-pcihost" + +#define UNI_NORTH_PCI_HOST_BRIDGE(obj) \ + OBJECT_CHECK(UNINState, (obj), TYPE_UNI_NORTH_PCI_HOST_BRIDGE) +#define UNI_NORTH_AGP_HOST_BRIDGE(obj) \ + OBJECT_CHECK(UNINState, (obj), TYPE_UNI_NORTH_AGP_HOST_BRIDGE) +#define UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE(obj) \ + OBJECT_CHECK(UNINState, (obj), TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRID= GE) +#define U3_AGP_HOST_BRIDGE(obj) \ + OBJECT_CHECK(UNINState, (obj), TYPE_U3_AGP_HOST_BRIDGE) + typedef struct UNINState { PCIHostState host_state; + MemoryRegion pci_mmio; MemoryRegion pci_hole; } UNINState; @@ -130,19 +145,17 @@ static const MemoryRegionOps unin_data_ops =3D { static int pci_unin_main_init_device(SysBusDevice *dev) { PCIHostState *h; - UNINState *s; =20 /* Use values found on a real PowerMac */ /* Uninorth main bus */ h =3D FROM_SYSBUS(PCIHostState, dev); - s =3D DO_UPCAST(UNINState, host_state, h); =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, &unin_data_ops, s, + memory_region_init_io(&h->conf_mem, &pci_host_conf_le_ops, + dev, "pci-conf-idx", 0x1000); + memory_region_init_io(&h->data_mem, &unin_data_ops, dev, "pci-conf-data", 0x1000); - sysbus_init_mmio(dev, &s->host_state.conf_mem); - sysbus_init_mmio(dev, &s->host_state.data_mem); + sysbus_init_mmio(dev, &h->conf_mem); + sysbus_init_mmio(dev, &h->data_mem); =20 return 0; } @@ -151,18 +164,16 @@ static int pci_unin_main_init_device(SysBusDevice *= dev) static int pci_u3_agp_init_device(SysBusDevice *dev) { PCIHostState *h; - UNINState *s; =20 /* Uninorth U3 AGP bus */ h =3D FROM_SYSBUS(PCIHostState, dev); - s =3D DO_UPCAST(UNINState, host_state, h); =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, &unin_data_ops, s, + memory_region_init_io(&h->conf_mem, &pci_host_conf_le_ops, + dev, "pci-conf-idx", 0x1000); + memory_region_init_io(&h->data_mem, &unin_data_ops, dev, "pci-conf-data", 0x1000); - sysbus_init_mmio(dev, &s->host_state.conf_mem); - sysbus_init_mmio(dev, &s->host_state.data_mem); + sysbus_init_mmio(dev, &h->conf_mem); + sysbus_init_mmio(dev, &h->data_mem); =20 return 0; } @@ -170,36 +181,32 @@ static int pci_u3_agp_init_device(SysBusDevice *dev= ) static int pci_unin_agp_init_device(SysBusDevice *dev) { PCIHostState *h; - UNINState *s; =20 /* Uninorth AGP bus */ h =3D FROM_SYSBUS(PCIHostState, dev); - s =3D DO_UPCAST(UNINState, host_state, h); =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-conf-data", 0x1000); - sysbus_init_mmio(dev, &s->host_state.conf_mem); - sysbus_init_mmio(dev, &s->host_state.data_mem); + memory_region_init_io(&h->conf_mem, &pci_host_conf_le_ops, + dev, "pci-conf-idx", 0x1000); + memory_region_init_io(&h->data_mem, &pci_host_data_le_ops, + dev, "pci-conf-data", 0x1000); + sysbus_init_mmio(dev, &h->conf_mem); + sysbus_init_mmio(dev, &h->data_mem); return 0; } =20 static int pci_unin_internal_init_device(SysBusDevice *dev) { PCIHostState *h; - UNINState *s; =20 /* Uninorth internal bus */ h =3D FROM_SYSBUS(PCIHostState, dev); - s =3D DO_UPCAST(UNINState, host_state, h); =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-conf-data", 0x1000); - sysbus_init_mmio(dev, &s->host_state.conf_mem); - sysbus_init_mmio(dev, &s->host_state.data_mem); + memory_region_init_io(&h->conf_mem, &pci_host_conf_le_ops, + dev, "pci-conf-idx", 0x1000); + memory_region_init_io(&h->data_mem, &pci_host_data_le_ops, + dev, "pci-conf-data", 0x1000); + sysbus_init_mmio(dev, &h->conf_mem); + sysbus_init_mmio(dev, &h->data_mem); return 0; } =20 @@ -214,26 +221,26 @@ PCIBus *pci_pmac_init(qemu_irq *pic, =20 /* Use values found on a real PowerMac */ /* Uninorth main bus */ - dev =3D qdev_create(NULL, "uni-north-pci-pcihost"); + dev =3D qdev_create(NULL, TYPE_UNI_NORTH_PCI_HOST_BRIDGE); qdev_init_nofail(dev); - s =3D sysbus_from_qdev(dev); + s =3D SYS_BUS_DEVICE(dev); h =3D FROM_SYSBUS(PCIHostState, s); - d =3D DO_UPCAST(UNINState, host_state, h); + d =3D UNI_NORTH_PCI_HOST_BRIDGE(dev); memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL); memory_region_init_alias(&d->pci_hole, "pci-hole", &d->pci_mmio, 0x80000000ULL, 0x70000000ULL); memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - d->host_state.bus =3D pci_register_bus(dev, "pci", - pci_unin_set_irq, pci_unin_map_= irq, - pic, - &d->pci_mmio, - address_space_io, - PCI_DEVFN(11, 0), 4); + h->bus =3D pci_register_bus(dev, "pci", + pci_unin_set_irq, pci_unin_map_irq, + pic, + &d->pci_mmio, + address_space_io, + PCI_DEVFN(11, 0), 4); =20 #if 0 - pci_create_simple(d->host_state.bus, PCI_DEVFN(11, 0), "uni-north"); + pci_create_simple(h->bus, PCI_DEVFN(11, 0), "uni-north"); #endif =20 sysbus_mmio_map(s, 0, 0xf2800000); @@ -242,30 +249,30 @@ PCIBus *pci_pmac_init(qemu_irq *pic, /* DEC 21154 bridge */ #if 0 /* XXX: not activated as PPC BIOS doesn't handle multiple buses prop= erly */ - pci_create_simple(d->host_state.bus, PCI_DEVFN(12, 0), "dec-21154"); + pci_create_simple(h->bus, PCI_DEVFN(12, 0), "dec-21154"); #endif =20 /* Uninorth AGP bus */ - pci_create_simple(d->host_state.bus, PCI_DEVFN(11, 0), "uni-north-ag= p"); - dev =3D qdev_create(NULL, "uni-north-agp-pcihost"); + pci_create_simple(h->bus, PCI_DEVFN(11, 0), "uni-north-agp"); + dev =3D qdev_create(NULL, TYPE_UNI_NORTH_AGP_HOST_BRIDGE); qdev_init_nofail(dev); - s =3D sysbus_from_qdev(dev); + s =3D SYS_BUS_DEVICE(dev); sysbus_mmio_map(s, 0, 0xf0800000); sysbus_mmio_map(s, 1, 0xf0c00000); =20 /* Uninorth internal bus */ #if 0 /* XXX: not needed for now */ - pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0), + pci_create_simple(h->bus, PCI_DEVFN(14, 0), "uni-north-internal-pci"); - dev =3D qdev_create(NULL, "uni-north-internal-pci-pcihost"); + dev =3D qdev_create(NULL, TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE); qdev_init_nofail(dev); - s =3D sysbus_from_qdev(dev); + s =3D SYS_BUS_DEVICE(dev); sysbus_mmio_map(s, 0, 0xf4800000); sysbus_mmio_map(s, 1, 0xf4c00000); #endif =20 - return d->host_state.bus; + return h->bus; } =20 PCIBus *pci_pmac_u3_init(qemu_irq *pic, @@ -279,11 +286,11 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic, =20 /* Uninorth AGP bus */ =20 - dev =3D qdev_create(NULL, "u3-agp-pcihost"); + dev =3D qdev_create(NULL, TYPE_U3_AGP_HOST_BRIDGE); qdev_init_nofail(dev); - s =3D sysbus_from_qdev(dev); + s =3D SYS_BUS_DEVICE(dev); h =3D FROM_SYSBUS(PCIHostState, s); - d =3D DO_UPCAST(UNINState, host_state, h); + d =3D U3_AGP_HOST_BRIDGE(dev); =20 memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL); memory_region_init_alias(&d->pci_hole, "pci-hole", &d->pci_mmio, @@ -291,19 +298,19 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic, memory_region_add_subregion(address_space_mem, 0x80000000ULL, &d->pci_hole); =20 - d->host_state.bus =3D pci_register_bus(dev, "pci", - pci_unin_set_irq, pci_unin_map_= irq, - pic, - &d->pci_mmio, - address_space_io, - PCI_DEVFN(11, 0), 4); + h->bus =3D pci_register_bus(dev, "pci", + pci_unin_set_irq, pci_unin_map_irq, + pic, + &d->pci_mmio, + address_space_io, + PCI_DEVFN(11, 0), 4); =20 sysbus_mmio_map(s, 0, 0xf0800000); sysbus_mmio_map(s, 1, 0xf0c00000); =20 - pci_create_simple(d->host_state.bus, 11 << 3, "u3-agp"); + pci_create_simple(h->bus, 11 << 3, "u3-agp"); =20 - return d->host_state.bus; + return h->bus; } =20 static int unin_main_pci_host_init(PCIDevice *d) @@ -419,7 +426,7 @@ static void pci_unin_main_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo pci_unin_main_info =3D { - .name =3D "uni-north-pci-pcihost", + .name =3D TYPE_UNI_NORTH_PCI_HOST_BRIDGE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(UNINState), .class_init =3D pci_unin_main_class_init, @@ -433,7 +440,7 @@ static void pci_u3_agp_class_init(ObjectClass *klass,= void *data) } =20 static const TypeInfo pci_u3_agp_info =3D { - .name =3D "u3-agp-pcihost", + .name =3D TYPE_U3_AGP_HOST_BRIDGE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(UNINState), .class_init =3D pci_u3_agp_class_init, @@ -447,7 +454,7 @@ static void pci_unin_agp_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo pci_unin_agp_info =3D { - .name =3D "uni-north-agp-pcihost", + .name =3D TYPE_UNI_NORTH_AGP_HOST_BRIDGE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(UNINState), .class_init =3D pci_unin_agp_class_init, @@ -461,7 +468,7 @@ static void pci_unin_internal_class_init(ObjectClass = *klass, void *data) } =20 static const TypeInfo pci_unin_internal_info =3D { - .name =3D "uni-north-internal-pci-pcihost", + .name =3D TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(UNINState), .class_init =3D pci_unin_internal_class_init, --=20 1.7.7