diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-04 11:52:49 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-27 10:50:47 -0600 |
| commit | 8f04ee0882aec9fe91fb70f767edf5dacff59835 (patch) | |
| tree | 01ebc9678569233858c2343c9cb04e62c2df55ad /hw/applesmc.c | |
| parent | e855761ca8fa08ebe29c1e69abc6f0863a453f92 (diff) | |
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 <aliguori@us.ibm.com>
Diffstat (limited to 'hw/applesmc.c')
| -rw-r--r-- | hw/applesmc.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/hw/applesmc.c b/hw/applesmc.c index c47b592747..a6e88bc7b7 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), |