mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -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
|
@ -355,6 +355,7 @@ static Property pcnet_properties[] = {
|
|||
|
||||
static void pcnet_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
||||
|
||||
k->init = pci_pcnet_init;
|
||||
|
@ -363,20 +364,21 @@ static void pcnet_class_init(ObjectClass *klass, void *data)
|
|||
k->device_id = PCI_DEVICE_ID_AMD_LANCE;
|
||||
k->revision = 0x10;
|
||||
k->class_id = PCI_CLASS_NETWORK_ETHERNET;
|
||||
dc->reset = pci_reset;
|
||||
dc->vmsd = &vmstate_pci_pcnet;
|
||||
dc->props = pcnet_properties;
|
||||
}
|
||||
|
||||
static DeviceInfo pcnet_info = {
|
||||
.name = "pcnet",
|
||||
.size = sizeof(PCIPCNetState),
|
||||
.reset = pci_reset,
|
||||
.vmsd = &vmstate_pci_pcnet,
|
||||
.props = pcnet_properties,
|
||||
.class_init = pcnet_class_init,
|
||||
static TypeInfo pcnet_info = {
|
||||
.name = "pcnet",
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(PCIPCNetState),
|
||||
.class_init = pcnet_class_init,
|
||||
};
|
||||
|
||||
static void pci_pcnet_register_devices(void)
|
||||
{
|
||||
pci_qdev_register(&pcnet_info);
|
||||
type_register_static(&pcnet_info);
|
||||
}
|
||||
|
||||
device_init(pci_pcnet_register_devices)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue