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/ne2000-isa.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/ne2000-isa.c')
| -rw-r--r-- | hw/ne2000-isa.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 5bc5f2a40d..25a7a31d25 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -82,11 +82,17 @@ static int isa_ne2000_initfn(ISADevice *dev) return 0; } -static ISADeviceInfo ne2000_isa_info = { - .qdev.name = "ne2k_isa", - .qdev.size = sizeof(ISANE2000State), - .init = isa_ne2000_initfn, - .qdev.props = (Property[]) { +static void isa_ne2000_class_initfn(ObjectClass *klass, void *data) +{ + ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); + ic->init = isa_ne2000_initfn; +} + +static DeviceInfo ne2000_isa_info = { + .name = "ne2k_isa", + .size = sizeof(ISANE2000State), + .class_init = isa_ne2000_class_initfn, + .props = (Property[]) { DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0x300), DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9), DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c), |