diff options
Diffstat (limited to 'hw/bonito.c')
-rw-r--r-- | hw/bonito.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/hw/bonito.c b/hw/bonito.c index 0333a2ed8f..7350a4f9ec 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -768,6 +768,7 @@ PCIBus *bonito_init(qemu_irq *pic) static void bonito_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = bonito_initfn; @@ -775,34 +776,37 @@ static void bonito_class_init(ObjectClass *klass, void *data) k->device_id = 0x00d5; k->revision = 0x01; k->class_id = PCI_CLASS_BRIDGE_HOST; + dc->desc = "Host bridge"; + dc->no_user = 1; + dc->vmsd = &vmstate_bonito; } -static DeviceInfo bonito_info = { - .name = "Bonito", - .desc = "Host bridge", - .size = sizeof(PCIBonitoState), - .vmsd = &vmstate_bonito, - .no_user = 1, - .class_init = bonito_class_init, +static TypeInfo bonito_info = { + .name = "Bonito", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIBonitoState), + .class_init = bonito_class_init, }; static void bonito_pcihost_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = bonito_pcihost_initfn; + dc->no_user = 1; } -static DeviceInfo bonito_pcihost_info = { - .name = "Bonito-pcihost", - .size = sizeof(BonitoState), - .no_user = 1, - .class_init = bonito_pcihost_class_init, +static TypeInfo bonito_pcihost_info = { + .name = "Bonito-pcihost", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(BonitoState), + .class_init = bonito_pcihost_class_init, }; static void bonito_register(void) { - sysbus_register_withprop(&bonito_pcihost_info); - pci_qdev_register(&bonito_info); + type_register_static(&bonito_pcihost_info); + type_register_static(&bonito_info); } device_init(bonito_register); |