diff options
author | Anthony Liguori | 2011-12-08 04:34:16 +0100 |
---|---|---|
committer | Anthony Liguori | 2012-02-03 17:41:06 +0100 |
commit | 39bffca2030950ef6efe57c2fac8327a45ae1015 (patch) | |
tree | 325262f44978e6116c9e43f688c900e08ee83738 /hw/lm32_uart.c | |
parent | qdev: kill off DeviceInfo list (diff) | |
download | qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.gz qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.xz qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.zip |
qdev: register all types natively through QEMU Object Model
This was done in a mostly automated fashion. I did it in three steps and then
rebased it into a single step which avoids repeatedly touching every file in
the tree.
The first step was a sed-based addition of the parent type to the subclass
registration functions.
The second step was another sed-based removal of subclass registration functions
while also adding virtual functions from the base class into a class_init
function as appropriate.
Finally, a python script was used to convert the DeviceInfo structures and
qdev_register_subclass functions to TypeInfo structures, class_init functions,
and type_register_static calls.
We are almost fully converted to QOM after this commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/lm32_uart.c')
-rw-r--r-- | hw/lm32_uart.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c index ea7d00edef..fc70490e32 100644 --- a/hw/lm32_uart.c +++ b/hw/lm32_uart.c @@ -273,22 +273,24 @@ static const VMStateDescription vmstate_lm32_uart = { static void lm32_uart_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = lm32_uart_init; + dc->reset = uart_reset; + dc->vmsd = &vmstate_lm32_uart; } -static DeviceInfo lm32_uart_info = { - .name = "lm32-uart", - .size = sizeof(LM32UartState), - .vmsd = &vmstate_lm32_uart, - .reset = uart_reset, - .class_init = lm32_uart_class_init, +static TypeInfo lm32_uart_info = { + .name = "lm32-uart", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(LM32UartState), + .class_init = lm32_uart_class_init, }; static void lm32_uart_register(void) { - sysbus_register_withprop(&lm32_uart_info); + type_register_static(&lm32_uart_info); } device_init(lm32_uart_register) |