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/serial.c | |
| parent | e855761ca8fa08ebe29c1e69abc6f0863a453f92 (diff) | |
| download | qemu-8f04ee0882aec9fe91fb70f767edf5dacff59835.zip qemu-8f04ee0882aec9fe91fb70f767edf5dacff59835.tar.gz qemu-8f04ee0882aec9fe91fb70f767edf5dacff59835.tar.bz2 | |
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/serial.c')
| -rw-r--r-- | hw/serial.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/hw/serial.c b/hw/serial.c index d35c7a9..2644b13 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -879,12 +879,18 @@ SerialState *serial_mm_init(MemoryRegion *address_space, return s; } -static ISADeviceInfo serial_isa_info = { - .qdev.name = "isa-serial", - .qdev.size = sizeof(ISASerialState), - .qdev.vmsd = &vmstate_isa_serial, - .init = serial_isa_initfn, - .qdev.props = (Property[]) { +static void serial_isa_class_initfn(ObjectClass *klass, void *data) +{ + ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); + ic->init = serial_isa_initfn; +} + +static DeviceInfo serial_isa_info = { + .name = "isa-serial", + .size = sizeof(ISASerialState), + .vmsd = &vmstate_isa_serial, + .class_init = serial_isa_class_initfn, + .props = (Property[]) { DEFINE_PROP_UINT32("index", ISASerialState, index, -1), DEFINE_PROP_HEX32("iobase", ISASerialState, iobase, -1), DEFINE_PROP_UINT32("irq", ISASerialState, isairq, -1), |