diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-24 13:12:29 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 10:50:50 -0600 |
| commit | 999e12bbe85c5dcf49bef13bce4f97399c7105f4 (patch) | |
| tree | 73b6ed8633a73134e9f728baa1ed2b1dab58b5b0 /hw/armv7m_nvic.c | |
| parent | 40021f08882aaef93c66c8c740087b6d3031b63a (diff) | |
sysbus: apic: ioapic: convert to QEMU Object Model
This converts three devices because apic and ioapic are subclasses of sysbus.
Converting subclasses independently of their base class is prohibitively hard.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/armv7m_nvic.c')
| -rw-r--r-- | hw/armv7m_nvic.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c index 28f36ba52..2bb94e87e 100644 --- a/hw/armv7m_nvic.c +++ b/hw/armv7m_nvic.c @@ -391,12 +391,19 @@ static int armv7m_nvic_init(SysBusDevice *dev) return 0; } -static SysBusDeviceInfo armv7m_nvic_priv_info = { - .init = armv7m_nvic_init, - .qdev.name = "armv7m_nvic", - .qdev.size = sizeof(nvic_state), - .qdev.vmsd = &vmstate_nvic, - .qdev.props = (Property[]) { +static void armv7m_nvic_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); + + sdc->init = armv7m_nvic_init; +} + +static DeviceInfo armv7m_nvic_priv_info = { + .name = "armv7m_nvic", + .size = sizeof(nvic_state), + .vmsd = &vmstate_nvic, + .class_init = armv7m_nvic_class_init, + .props = (Property[]) { /* The ARM v7m may have anything from 0 to 496 external interrupt * IRQ lines. We default to 64. Other boards may differ and should * set this property appropriately. @@ -408,7 +415,7 @@ static SysBusDeviceInfo armv7m_nvic_priv_info = { static void armv7m_nvic_register_devices(void) { - sysbus_register_withprop(&armv7m_nvic_priv_info); + sysbus_qdev_register(&armv7m_nvic_priv_info); } device_init(armv7m_nvic_register_devices) |