mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43: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
30
hw/i8254.c
30
hw/i8254.c
|
@ -535,28 +535,32 @@ static int pit_initfn(ISADevice *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static Property pit_properties[] = {
|
||||
DEFINE_PROP_UINT32("irq", PITState, irq, -1),
|
||||
DEFINE_PROP_HEX32("iobase", PITState, iobase, -1),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void pit_class_initfn(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
|
||||
ic->init = pit_initfn;
|
||||
dc->no_user = 1;
|
||||
dc->reset = pit_reset;
|
||||
dc->vmsd = &vmstate_pit;
|
||||
dc->props = pit_properties;
|
||||
}
|
||||
|
||||
static DeviceInfo pit_info = {
|
||||
.name = "isa-pit",
|
||||
.size = sizeof(PITState),
|
||||
.vmsd = &vmstate_pit,
|
||||
.reset = pit_reset,
|
||||
.no_user = 1,
|
||||
.class_init = pit_class_initfn,
|
||||
.props = (Property[]) {
|
||||
DEFINE_PROP_UINT32("irq", PITState, irq, -1),
|
||||
DEFINE_PROP_HEX32("iobase", PITState, iobase, -1),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
},
|
||||
static TypeInfo pit_info = {
|
||||
.name = "isa-pit",
|
||||
.parent = TYPE_ISA_DEVICE,
|
||||
.instance_size = sizeof(PITState),
|
||||
.class_init = pit_class_initfn,
|
||||
};
|
||||
|
||||
static void pit_register(void)
|
||||
{
|
||||
isa_qdev_register(&pit_info);
|
||||
type_register_static(&pit_info);
|
||||
}
|
||||
device_init(pit_register)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue