david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prep_pci: QOM'ify Raven PCI host bridge

Browse Source 
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:
Andreas Färber 2012-08-20 19:08:04 +02:00 committed by Anthony Liguori
parent 9c1a61f0e5
commit 03a6b66770
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/prep_pci.c
View File

@ -28,8 +28,14 @@
#include "pc.h" #include "pc.h"
#include "exec-memory.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 { typedef struct PRePPCIState {
PCIHostState host_state; PCIHostState host_state;
MemoryRegion intack; MemoryRegion intack;
qemu_irq irq[4]; qemu_irq irq[4];
} PREPPCIState; } PREPPCIState;
@ -43,9 +49,10 @@ static inline uint32_t PPC_PCIIO_config(target_phys_addr_t addr)
int i; int i;
for (i = 0; i < 11; i++) { for (i = 0; i < 11; i++) {
if ((addr & (1 << (11 + i))) != 0) if ((addr & (1 << (11 + i))) != 0) {
break; break;
} }
}
return (addr & 0x7ff) | (i << 11); 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) static int raven_pcihost_init(SysBusDevice *dev)
{ {
PCIHostState *h = FROM_SYSBUS(PCIHostState, 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_mem = get_system_memory();
MemoryRegion *address_space_io = get_system_io(); MemoryRegion *address_space_io = get_system_io();
PCIBus *bus; PCIBus *bus;
@ -107,7 +114,7 @@ static int raven_pcihost_init(SysBusDevice *dev)
sysbus_init_irq(dev, &s->irq[i]); 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, prep_set_irq, prep_map_irq, s->irq,
address_space_mem, address_space_io, 0, 4); address_space_mem, address_space_io, 0, 4);
h->bus = bus; h->bus = bus;
@ -184,7 +191,7 @@ static void raven_pcihost_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo raven_pcihost_info = { static const TypeInfo raven_pcihost_info = {
.name = "raven-pcihost", .name = TYPE_RAVEN_PCI_HOST_BRIDGE,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PREPPCIState), .instance_size = sizeof(PREPPCIState),
.class_init = raven_pcihost_class_init, .class_init = raven_pcihost_class_init,