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/fdc.c | |
| parent | e855761ca8fa08ebe29c1e69abc6f0863a453f92 (diff) | |
| download | focaccia-qemu-8f04ee0882aec9fe91fb70f767edf5dacff59835.tar.gz focaccia-qemu-8f04ee0882aec9fe91fb70f767edf5dacff59835.zip | |
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/fdc.c')
| -rw-r--r-- | hw/fdc.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/hw/fdc.c b/hw/fdc.c index 70aa5c7b56..f7612217b8 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1959,15 +1959,21 @@ static const VMStateDescription vmstate_isa_fdc ={ } }; -static ISADeviceInfo isa_fdc_info = { - .init = isabus_fdc_init1, - .qdev.name = "isa-fdc", - .qdev.fw_name = "fdc", - .qdev.size = sizeof(FDCtrlISABus), - .qdev.no_user = 1, - .qdev.vmsd = &vmstate_isa_fdc, - .qdev.reset = fdctrl_external_reset_isa, - .qdev.props = (Property[]) { +static void isabus_fdc_class_init1(ObjectClass *klass, void *data) +{ + ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); + ic->init = isabus_fdc_init1; +} + +static DeviceInfo isa_fdc_info = { + .class_init = isabus_fdc_class_init1, + .name = "isa-fdc", + .fw_name = "fdc", + .size = sizeof(FDCtrlISABus), + .no_user = 1, + .vmsd = &vmstate_isa_fdc, + .reset = fdctrl_external_reset_isa, + .props = (Property[]) { DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.drives[0].bs), DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.drives[1].bs), DEFINE_PROP_INT32("bootindexA", FDCtrlISABus, bootindexA, -1), |