[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.2 v6 07/14] ppc4xx_pci: QOM'ify ppc4xx PCI hos
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.2 v6 07/14] ppc4xx_pci: QOM'ify ppc4xx PCI host bridge |
Date: |
Mon, 13 Aug 2012 18:11:28 +0200 |
Introduce type constant and cast macro. Avoid accessing its parent field
directly.
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
---
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);
/* PCI */
- dev = sysbus_create_varargs("ppc4xx-pcihost", PPC440EP_PCI_CONFIG,
+ dev = 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);
+#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;
};
+#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
@@ -335,17 +338,17 @@ static int ppc4xx_pcihost_initfn(SysBusDevice *dev)
PCIBus *b;
int i;
- h = FROM_SYSBUS(PCIHostState, sysbus_from_qdev(dev));
- s = DO_UPCAST(PPC4xxPCIState, pci_state, h);
+ h = FROM_SYSBUS(PCIHostState, dev);
+ s = PPC4xx_PCI_HOST_BRIDGE(dev);
for (i = 0; i < ARRAY_SIZE(s->irq); i++) {
sysbus_init_irq(dev, &s->irq[i]);
}
- b = pci_register_bus(&s->pci_state.busdev.qdev, NULL, ppc4xx_pci_set_irq,
+ b = 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 = b;
+ h->bus = b;
pci_create_simple(b, 0, "ppc4xx-host-bridge");
@@ -394,7 +397,7 @@ static void ppc4xx_pcihost_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo ppc4xx_pcihost_info = {
- .name = "ppc4xx-pcihost",
+ .name = TYPE_PPC4xx_PCI_HOST_BRIDGE,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PPC4xxPCIState),
.class_init = ppc4xx_pcihost_class_init,
--
1.7.7
- [Qemu-devel] [PATCH for-1.2 v6 00/14] pci_host: Convert to QOM, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 02/14] alpha_typhoon: QOM'ify Typhoon PCI host bridge, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 04/14] dec_pci: QOM'ify DEC 21154 PCI-PCI bridge, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 03/14] bonito: QOM'ify Bonito PCI host bridge, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 01/14] pci: Make host bridge TypeInfos const, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 05/14] grackle_pci: QOM'ify Grackle PCI host bridge, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 09/14] prep_pci: QOM'ify Raven PCI host bridge, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 06/14] gt64xxx: QOM'ify GT64120 PCI host bridge, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 08/14] ppce500_pci: QOM'ify e500 PCI host bridge, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 10/14] spapr_pci: QOM'ify sPAPR PCI host bridge, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 07/14] ppc4xx_pci: QOM'ify ppc4xx PCI host bridge,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.2 v6 11/14] unin_pci: QOM'ify UniNorth PCI host bridges, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 12/14] pci_host: Turn into SysBus-derived QOM type, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 14/14] pci: Tidy up PCI host bridges, Andreas Färber, 2012/08/13
- [Qemu-devel] [PATCH for-1.2 v6 13/14] pci: Derive PCI host bridges from TYPE_PCI_HOST_BRIDGE, Andreas Färber, 2012/08/13