diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-08-20 19:07:59 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 10:47:15 -0500 |
| commit | ab6153673727cc1b88258675fa02113cf3271aa8 (patch) | |
| tree | 5d01ed8a1d0386533d40e79ce622b3fb1f76ce66 /hw | |
| parent | c5589ee9745319944886231935680fb8d110e6cb (diff) | |
| download | qemu-ab6153673727cc1b88258675fa02113cf3271aa8.zip qemu-ab6153673727cc1b88258675fa02113cf3271aa8.tar.gz qemu-ab6153673727cc1b88258675fa02113cf3271aa8.tar.bz2 | |
dec_pci: QOM'ify DEC 21154 PCI-PCI bridge
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ärber <afaerber@suse.de>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/dec_pci.c | 21 | ||||
| -rw-r--r-- | 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 +#define DEC_21154(obj) OBJECT_CHECK(DECState, (obj), TYPE_DEC_21154) + typedef struct DECState { - SysBusDevice busdev; PCIHostState host_state; } DECState; @@ -88,16 +89,16 @@ PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn) static int pci_dec_21154_device_init(SysBusDevice *dev) { - DECState *s; + PCIHostState *phb; - s = FROM_SYSBUS(DECState, dev); + phb = FROM_SYSBUS(PCIHostState, dev); - 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; } @@ -134,7 +135,7 @@ static void pci_dec_21154_device_class_init(ObjectClass *klass, void *data) } static const TypeInfo pci_dec_21154_device_info = { - .name = "dec-21154-sysbus", + .name = TYPE_DEC_21154, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(DECState), .class_init = 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 @@ #include "qemu-common.h" +#define TYPE_DEC_21154 "dec-21154-sysbus" + PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn); #endif |