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

@ -471,54 +471,60 @@ static int pl111_init(SysBusDevice *dev)
static void pl110_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = pl110_init;
dc->no_user = 1;
dc->vmsd = &vmstate_pl110;
}
static DeviceInfo pl110_info = {
.name = "pl110",
.size = sizeof(pl110_state),
.vmsd = &vmstate_pl110,
.no_user = 1,
.class_init = pl110_class_init,
static TypeInfo pl110_info = {
.name = "pl110",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(pl110_state),
.class_init = pl110_class_init,
};
static void pl110_versatile_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = pl110_versatile_init;
dc->no_user = 1;
dc->vmsd = &vmstate_pl110;
}
static DeviceInfo pl110_versatile_info = {
.name = "pl110_versatile",
.size = sizeof(pl110_state),
.vmsd = &vmstate_pl110,
.no_user = 1,
.class_init = pl110_versatile_class_init,
static TypeInfo pl110_versatile_info = {
.name = "pl110_versatile",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(pl110_state),
.class_init = pl110_versatile_class_init,
};
static void pl111_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = pl111_init;
dc->no_user = 1;
dc->vmsd = &vmstate_pl110;
}
static DeviceInfo pl111_info = {
.name = "pl111",
.size = sizeof(pl110_state),
.vmsd = &vmstate_pl110,
.no_user = 1,
.class_init = pl111_class_init,
static TypeInfo pl111_info = {
.name = "pl111",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(pl110_state),
.class_init = pl111_class_init,
};
static void pl110_register_devices(void)
{
sysbus_register_withprop(&pl110_info);
sysbus_register_withprop(&pl110_versatile_info);
sysbus_register_withprop(&pl111_info);
type_register_static(&pl110_info);
type_register_static(&pl110_versatile_info);
type_register_static(&pl111_info);
}
device_init(pl110_register_devices)