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/ne2000-isa.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'hw/ne2000-isa.c') diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 5bc5f2a..25a7a31 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), -- cgit v1.1