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/mips_malta.c | |
| parent | 40021f08882aaef93c66c8c740087b6d3031b63a (diff) | |
| download | qemu-999e12bbe85c5dcf49bef13bce4f97399c7105f4.zip qemu-999e12bbe85c5dcf49bef13bce4f97399c7105f4.tar.gz qemu-999e12bbe85c5dcf49bef13bce4f97399c7105f4.tar.bz2 | |
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/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 4a4f76d..64603ce 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -1007,11 +1007,18 @@ static int mips_malta_sysbus_device_init(SysBusDevice *sysbusdev) return 0; } -static SysBusDeviceInfo mips_malta_device = { - .init = mips_malta_sysbus_device_init, - .qdev.name = "mips-malta", - .qdev.size = sizeof(MaltaState), - .qdev.props = (Property[]) { +static void mips_malta_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = mips_malta_sysbus_device_init; +} + +static DeviceInfo mips_malta_device = { + .name = "mips-malta", + .size = sizeof(MaltaState), + .class_init = mips_malta_class_init, + .props = (Property[]) { DEFINE_PROP_END_OF_LIST(), } }; @@ -1026,7 +1033,7 @@ static QEMUMachine mips_malta_machine = { static void mips_malta_device_init(void) { - sysbus_register_withprop(&mips_malta_device); + sysbus_qdev_register(&mips_malta_device); } static void mips_malta_machine_init(void) |