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>
This commit is contained in:
Anthony Liguori 2011-12-07 21:34:16 -06:00
parent 212ad11168
commit 39bffca203
243 changed files with 3169 additions and 2543 deletions

View file

@ -269,11 +269,12 @@ static void tosa_dac_class_init(ObjectClass *klass, void *data)
k->send = tosa_dac_send;
}
static DeviceInfo tosa_dac_info = {
.name = "tosa_dac",
.size = sizeof(TosaDACState),
.class_init = tosa_dac_class_init,
};
static TypeInfo tosa_dac_info = {
.name = "tosa_dac",
.parent = TYPE_I2C_SLAVE,
.instance_size = sizeof(TosaDACState),
.class_init = tosa_dac_class_init,
};
static void tosa_ssp_class_init(ObjectClass *klass, void *data)
{
@ -283,16 +284,17 @@ static void tosa_ssp_class_init(ObjectClass *klass, void *data)
k->transfer = tosa_ssp_tansfer;
}
static DeviceInfo tosa_ssp_info = {
.name = "tosa-ssp",
.size = sizeof(SSISlave),
.class_init = tosa_ssp_class_init,
static TypeInfo tosa_ssp_info = {
.name = "tosa-ssp",
.parent = TYPE_SSI_SLAVE,
.instance_size = sizeof(SSISlave),
.class_init = tosa_ssp_class_init,
};
static void tosa_register_devices(void)
{
i2c_register_slave(&tosa_dac_info);
ssi_register_slave(&tosa_ssp_info);
type_register_static(&tosa_dac_info);
type_register_static(&tosa_ssp_info);
}
device_init(tosa_register_devices)