diff options
Diffstat (limited to 'hw/sysbus.c')
| -rw-r--r-- | hw/sysbus.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/hw/sysbus.c b/hw/sysbus.c index 7d122f9eb5..282060abb6 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -105,7 +105,7 @@ void sysbus_init_ioports(SysBusDevice *dev, pio_addr_t ioport, pio_addr_t size) } } -static int sysbus_device_init(DeviceState *dev, DeviceInfo *base) +static int sysbus_device_init(DeviceState *dev) { SysBusDevice *sd = SYS_BUS_DEVICE(dev); SysBusDeviceClass *sbc = SYS_BUS_DEVICE_GET_CLASS(sd); @@ -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) |