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/debugcon.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'hw/debugcon.c') diff --git a/hw/debugcon.c b/hw/debugcon.c index c9ee6d90b..f2901229d 100644 --- a/hw/debugcon.c +++ b/hw/debugcon.c @@ -87,11 +87,17 @@ static int debugcon_isa_initfn(ISADevice *dev) return 0; } -static ISADeviceInfo debugcon_isa_info = { - .qdev.name = "isa-debugcon", - .qdev.size = sizeof(ISADebugconState), - .init = debugcon_isa_initfn, - .qdev.props = (Property[]) { +static void debugcon_isa_class_initfn(ObjectClass *klass, void *data) +{ + ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); + ic->init = debugcon_isa_initfn; +} + +static DeviceInfo debugcon_isa_info = { + .name = "isa-debugcon", + .size = sizeof(ISADebugconState), + .class_init = debugcon_isa_class_initfn, + .props = (Property[]) { DEFINE_PROP_HEX32("iobase", ISADebugconState, iobase, 0xe9), DEFINE_PROP_CHR("chardev", ISADebugconState, state.chr), DEFINE_PROP_HEX32("readback", ISADebugconState, state.readback, 0xe9), -- cgit v1.2.3