prep_pci: QOM'ify Raven PCI host bridge
Introduce type constant and cast macro. Avoid accessing parent fields directly. Also add missing space and braces. 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>
This commit is contained in:
parent
9c1a61f0e5
commit
03a6b66770
|
@ -28,8 +28,14 @@
|
|||
#include "pc.h"
|
||||
#include "exec-memory.h"
|
||||
|
||||
#define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost"
|
||||
|
||||
#define RAVEN_PCI_HOST_BRIDGE(obj) \
|
||||
OBJECT_CHECK(PREPPCIState, (obj), TYPE_RAVEN_PCI_HOST_BRIDGE)
|
||||
|
||||
typedef struct PRePPCIState {
|
||||
PCIHostState host_state;
|
||||
|
||||
MemoryRegion intack;
|
||||
qemu_irq irq[4];
|
||||
} PREPPCIState;
|
||||
|
@ -42,9 +48,10 @@ static inline uint32_t PPC_PCIIO_config(target_phys_addr_t addr)
|
|||
{
|
||||
int i;
|
||||
|
||||
for(i = 0; i < 11; i++) {
|
||||
if ((addr & (1 << (11 + i))) != 0)
|
||||
for (i = 0; i < 11; i++) {
|
||||
if ((addr & (1 << (11 + i))) != 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return (addr & 0x7ff) | (i << 11);
|
||||
}
|
||||
|
@ -97,7 +104,7 @@ static void prep_set_irq(void *opaque, int irq_num, int level)
|
|||
static int raven_pcihost_init(SysBusDevice *dev)
|
||||
{
|
||||
PCIHostState *h = FROM_SYSBUS(PCIHostState, dev);
|
||||
PREPPCIState *s = DO_UPCAST(PREPPCIState, host_state, h);
|
||||
PREPPCIState *s = RAVEN_PCI_HOST_BRIDGE(dev);
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *address_space_io = get_system_io();
|
||||
PCIBus *bus;
|
||||
|
@ -107,7 +114,7 @@ static int raven_pcihost_init(SysBusDevice *dev)
|
|||
sysbus_init_irq(dev, &s->irq[i]);
|
||||
}
|
||||
|
||||
bus = pci_register_bus(&h->busdev.qdev, NULL,
|
||||
bus = pci_register_bus(DEVICE(dev), NULL,
|
||||
prep_set_irq, prep_map_irq, s->irq,
|
||||
address_space_mem, address_space_io, 0, 4);
|
||||
h->bus = bus;
|
||||
|
@ -184,7 +191,7 @@ static void raven_pcihost_class_init(ObjectClass *klass, void *data)
|
|||
}
|
||||
|
||||
static const TypeInfo raven_pcihost_info = {
|
||||
.name = "raven-pcihost",
|
||||
.name = TYPE_RAVEN_PCI_HOST_BRIDGE,
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(PREPPCIState),
|
||||
.class_init = raven_pcihost_class_init,
|
||||
|
|
Loading…
Reference in a new issue