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/i2c.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'hw/i2c.c') diff --git a/hw/i2c.c b/hw/i2c.c index 9e5d3dfb1a..e21a666aff 100644 --- a/hw/i2c.c +++ b/hw/i2c.c @@ -204,19 +204,6 @@ static int i2c_slave_qdev_init(DeviceState *dev, DeviceInfo *base) return sc->init(s); } -void i2c_register_slave_subclass(DeviceInfo *info, const char *parent) -{ - assert(info->size >= sizeof(I2CSlave)); - info->init = i2c_slave_qdev_init; - info->bus_info = &i2c_bus_info; - qdev_register_subclass(info, parent); -} - -void i2c_register_slave(DeviceInfo *info) -{ - i2c_register_slave_subclass(info, TYPE_I2C_SLAVE); -} - DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr) { DeviceState *dev; @@ -227,12 +214,20 @@ DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr) return dev; } +static void i2c_slave_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *k = DEVICE_CLASS(klass); + k->init = i2c_slave_qdev_init; + k->bus_info = &i2c_bus_info; +} + static TypeInfo i2c_slave_type_info = { .name = TYPE_I2C_SLAVE, .parent = TYPE_DEVICE, .instance_size = sizeof(I2CSlave), .abstract = true, .class_size = sizeof(I2CSlaveClass), + .class_init = i2c_slave_class_init, }; static void i2c_slave_register_devices(void) -- cgit v1.2.3