From 8f04ee0882aec9fe91fb70f767edf5dacff59835 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Sun, 4 Dec 2011 11:52:49 -0600 Subject: isa: pic: convert to QEMU Object Model This converts two devices at once because PIC subclasses ISA and converting subclasses independently is extremely hard. Signed-off-by: Anthony Liguori --- hw/applesmc.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'hw/applesmc.c') diff --git a/hw/applesmc.c b/hw/applesmc.c index c47b592..a6e88bc 100644 --- a/hw/applesmc.c +++ b/hw/applesmc.c @@ -220,12 +220,18 @@ static int applesmc_isa_init(ISADevice *dev) return 0; } -static ISADeviceInfo applesmc_isa_info = { - .qdev.name = "isa-applesmc", - .qdev.size = sizeof(struct AppleSMCStatus), - .qdev.reset = qdev_applesmc_isa_reset, - .init = applesmc_isa_init, - .qdev.props = (Property[]) { +static void qdev_applesmc_class_init(ObjectClass *klass, void *data) +{ + ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); + ic->init = applesmc_isa_init; +} + +static DeviceInfo applesmc_isa_info = { + .name = "isa-applesmc", + .size = sizeof(struct AppleSMCStatus), + .reset = qdev_applesmc_isa_reset, + .class_init = qdev_applesmc_class_init, + .props = (Property[]) { DEFINE_PROP_HEX32("iobase", struct AppleSMCStatus, iobase, APPLESMC_DEFAULT_IOBASE), DEFINE_PROP_STRING("osk", struct AppleSMCStatus, osk), -- cgit v1.1