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/pl080.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/pl080.c')
| -rw-r--r-- | hw/pl080.c | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/hw/pl080.c b/hw/pl080.c index e001df92e..727bfa13d 100644 --- a/hw/pl080.c +++ b/hw/pl080.c @@ -373,20 +373,34 @@ static int pl081_init(SysBusDevice *dev) return pl08x_init(dev, 2); } -static SysBusDeviceInfo pl080_info = { - .init = pl080_init, - .qdev.name = "pl080", - .qdev.size = sizeof(pl080_state), - .qdev.vmsd = &vmstate_pl080, - .qdev.no_user = 1, +static void pl080_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = pl080_init; +} + +static DeviceInfo pl080_info = { + .name = "pl080", + .size = sizeof(pl080_state), + .vmsd = &vmstate_pl080, + .no_user = 1, + .class_init = pl080_class_init, }; -static SysBusDeviceInfo pl081_info = { - .init = pl081_init, - .qdev.name = "pl081", - .qdev.size = sizeof(pl080_state), - .qdev.vmsd = &vmstate_pl080, - .qdev.no_user = 1, +static void pl081_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = pl081_init; +} + +static DeviceInfo pl081_info = { + .name = "pl081", + .size = sizeof(pl080_state), + .vmsd = &vmstate_pl080, + .no_user = 1, + .class_init = pl081_class_init, }; /* The PL080 and PL081 are the same except for the number of channels |