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

@ -470,17 +470,19 @@ static int slavio_misc_init1(SysBusDevice *dev)
static void slavio_misc_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = slavio_misc_init1;
dc->reset = slavio_misc_reset;
dc->vmsd = &vmstate_misc;
}
static DeviceInfo slavio_misc_info = {
.name = "slavio_misc",
.size = sizeof(MiscState),
.vmsd = &vmstate_misc,
.reset = slavio_misc_reset,
.class_init = slavio_misc_class_init,
static TypeInfo slavio_misc_info = {
.name = "slavio_misc",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MiscState),
.class_init = slavio_misc_class_init,
};
static void apc_class_init(ObjectClass *klass, void *data)
@ -490,16 +492,17 @@ static void apc_class_init(ObjectClass *klass, void *data)
k->init = apc_init1;
}
static DeviceInfo apc_info = {
.name = "apc",
.size = sizeof(MiscState),
.class_init = apc_class_init,
static TypeInfo apc_info = {
.name = "apc",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MiscState),
.class_init = apc_class_init,
};
static void slavio_misc_register_devices(void)
{
sysbus_register_withprop(&slavio_misc_info);
sysbus_register_withprop(&apc_info);
type_register_static(&slavio_misc_info);
type_register_static(&apc_info);
}
device_init(slavio_misc_register_devices)