diff options
Diffstat (limited to 'hw/serial.c')
| -rw-r--r-- | hw/serial.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/hw/serial.c b/hw/serial.c index 2644b13a02..82917e24d7 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -879,29 +879,33 @@ SerialState *serial_mm_init(MemoryRegion *address_space, return s; } +static Property serial_isa_properties[] = { + DEFINE_PROP_UINT32("index", ISASerialState, index, -1), + DEFINE_PROP_HEX32("iobase", ISASerialState, iobase, -1), + DEFINE_PROP_UINT32("irq", ISASerialState, isairq, -1), + DEFINE_PROP_CHR("chardev", ISASerialState, state.chr), + DEFINE_PROP_END_OF_LIST(), +}; + static void serial_isa_class_initfn(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); ic->init = serial_isa_initfn; + dc->vmsd = &vmstate_isa_serial; + dc->props = serial_isa_properties; } -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), - DEFINE_PROP_CHR("chardev", ISASerialState, state.chr), - DEFINE_PROP_END_OF_LIST(), - }, +static TypeInfo serial_isa_info = { + .name = "isa-serial", + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof(ISASerialState), + .class_init = serial_isa_class_initfn, }; static void serial_register_devices(void) { - isa_qdev_register(&serial_isa_info); + type_register_static(&serial_isa_info); } device_init(serial_register_devices) |