mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -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
|
@ -739,17 +739,19 @@ static Property omap_gpio_properties[] = {
|
|||
|
||||
static void omap_gpio_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
||||
|
||||
k->init = omap_gpio_init;
|
||||
dc->reset = omap_gpif_reset;
|
||||
dc->props = omap_gpio_properties;
|
||||
}
|
||||
|
||||
static DeviceInfo omap_gpio_info = {
|
||||
.name = "omap-gpio",
|
||||
.size = sizeof(struct omap_gpif_s),
|
||||
.reset = omap_gpif_reset,
|
||||
.props = omap_gpio_properties,
|
||||
.class_init = omap_gpio_class_init,
|
||||
static TypeInfo omap_gpio_info = {
|
||||
.name = "omap-gpio",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(struct omap_gpif_s),
|
||||
.class_init = omap_gpio_class_init,
|
||||
};
|
||||
|
||||
static Property omap2_gpio_properties[] = {
|
||||
|
@ -766,23 +768,25 @@ static Property omap2_gpio_properties[] = {
|
|||
|
||||
static void omap2_gpio_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
||||
|
||||
k->init = omap2_gpio_init;
|
||||
dc->reset = omap2_gpif_reset;
|
||||
dc->props = omap2_gpio_properties;
|
||||
}
|
||||
|
||||
static DeviceInfo omap2_gpio_info = {
|
||||
.name = "omap2-gpio",
|
||||
.size = sizeof(struct omap2_gpif_s),
|
||||
.reset = omap2_gpif_reset,
|
||||
.props = omap2_gpio_properties,
|
||||
.class_init = omap2_gpio_class_init,
|
||||
static TypeInfo omap2_gpio_info = {
|
||||
.name = "omap2-gpio",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(struct omap2_gpif_s),
|
||||
.class_init = omap2_gpio_class_init,
|
||||
};
|
||||
|
||||
static void omap_gpio_register_device(void)
|
||||
{
|
||||
sysbus_register_withprop(&omap_gpio_info);
|
||||
sysbus_register_withprop(&omap2_gpio_info);
|
||||
type_register_static(&omap_gpio_info);
|
||||
type_register_static(&omap2_gpio_info);
|
||||
}
|
||||
|
||||
device_init(omap_gpio_register_device)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue