From 39bffca2030950ef6efe57c2fac8327a45ae1015 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 7 Dec 2011 21:34:16 -0600 Subject: 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 --- hw/tmp105.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'hw/tmp105.c') diff --git a/hw/tmp105.c b/hw/tmp105.c index 12fe60d019..a3bdd91d40 100644 --- a/hw/tmp105.c +++ b/hw/tmp105.c @@ -228,24 +228,26 @@ static int tmp105_init(I2CSlave *i2c) static void tmp105_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); k->init = tmp105_init; k->event = tmp105_event; k->recv = tmp105_rx; k->send = tmp105_tx; + dc->vmsd = &vmstate_tmp105; } -static DeviceInfo tmp105_info = { - .name = "tmp105", - .size = sizeof(TMP105State), - .vmsd = &vmstate_tmp105, - .class_init = tmp105_class_init, +static TypeInfo tmp105_info = { + .name = "tmp105", + .parent = TYPE_I2C_SLAVE, + .instance_size = sizeof(TMP105State), + .class_init = tmp105_class_init, }; static void tmp105_register_devices(void) { - i2c_register_slave(&tmp105_info); + type_register_static(&tmp105_info); } device_init(tmp105_register_devices) -- cgit v1.2.3-55-g7522