mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prep_pci: Convert to QOM realizefn 

SysBusDeviceClass' initfn merely calls SysBusDeviceClass::init, so we
can already hook up our own realizefn overwriting this behavior.

A symmetric unrealizefn is not necessary, knowing that the child's
unrealizefn is still no-op, too. Avoids ripping it out again when
recursive realization at DeviceState-level is implemented.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
This commit is contained in:
Andreas Färber 2013-01-16 15:45:34 +01:00
parent 98aca3c8e8
commit 8d5ce2e564
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/prep_pci.c
View File

@ -111,8 +111,9 @@ static void prep_set_irq(void *opaque, int irq_num, int level)
qemu_set_irq(pic[irq_num] , level); qemu_set_irq(pic[irq_num] , level);
} }
static int raven_pcihost_init(SysBusDevice *dev) static void raven_pcihost_realizefn(DeviceState *d, Error **errp)
{ {
SysBusDevice *dev = SYS_BUS_DEVICE(d);
PCIHostState *h = PCI_HOST_BRIDGE(dev); PCIHostState *h = PCI_HOST_BRIDGE(dev);
PREPPCIState *s = RAVEN_PCI_HOST_BRIDGE(dev); PREPPCIState *s = RAVEN_PCI_HOST_BRIDGE(dev);
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
@ -141,7 +142,7 @@ static int raven_pcihost_init(SysBusDevice *dev)
memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->intack); memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->intack);
/* TODO Remove once realize propagates to child devices. */ /* TODO Remove once realize propagates to child devices. */
return qdev_init(DEVICE(&s->pci_dev)); object_property_set_bool(OBJECT(&s->pci_dev), true, "realized", errp);
} }
static void raven_pcihost_initfn(Object *obj) static void raven_pcihost_initfn(Object *obj)
@ -207,10 +208,9 @@ static const TypeInfo raven_info = {
static void raven_pcihost_class_init(ObjectClass *klass, void *data) static void raven_pcihost_class_init(ObjectClass *klass, void *data)
{ {
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
k->init = raven_pcihost_init; dc->realize = raven_pcihost_realizefn;
dc->fw_name = "pci"; dc->fw_name = "pci";
dc->no_user = 1; dc->no_user = 1;
} }