mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 17:23:56 -06:00
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:
parent
212ad11168
commit
39bffca203
243 changed files with 3169 additions and 2543 deletions
22
hw/sysbus.c
22
hw/sysbus.c
|
@ -113,20 +113,6 @@ static int sysbus_device_init(DeviceState *dev, DeviceInfo *base)
|
|||
return sbc->init(sd);
|
||||
}
|
||||
|
||||
void sysbus_qdev_register_subclass(DeviceInfo *info, const char *parent)
|
||||
{
|
||||
info->init = sysbus_device_init;
|
||||
info->bus_info = &system_bus_info;
|
||||
|
||||
assert(info->size >= sizeof(SysBusDevice));
|
||||
qdev_register_subclass(info, parent);
|
||||
}
|
||||
|
||||
void sysbus_qdev_register(DeviceInfo *info)
|
||||
{
|
||||
sysbus_qdev_register_subclass(info, TYPE_SYS_BUS_DEVICE);
|
||||
}
|
||||
|
||||
DeviceState *sysbus_create_varargs(const char *name,
|
||||
target_phys_addr_t addr, ...)
|
||||
{
|
||||
|
@ -254,12 +240,20 @@ MemoryRegion *sysbus_address_space(SysBusDevice *dev)
|
|||
return get_system_memory();
|
||||
}
|
||||
|
||||
static void sysbus_device_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *k = DEVICE_CLASS(klass);
|
||||
k->init = sysbus_device_init;
|
||||
k->bus_info = &system_bus_info;
|
||||
}
|
||||
|
||||
static TypeInfo sysbus_device_type_info = {
|
||||
.name = TYPE_SYS_BUS_DEVICE,
|
||||
.parent = TYPE_DEVICE,
|
||||
.instance_size = sizeof(SysBusDevice),
|
||||
.abstract = true,
|
||||
.class_size = sizeof(SysBusDeviceClass),
|
||||
.class_init = sysbus_device_class_init,
|
||||
};
|
||||
|
||||
static void sysbus_register(void)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue