From 074f2fff798cb8f9588080b740dc356217a24720 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 10 Jun 2009 09:41:42 +0200 Subject: qdev: move name+size into DeviceInfo (v2) Rationale: move device information from code to data structures. v2: Adapt the drivers missed in the first version. Signed-off-by: Gerd Hoffmann --- hw/sysbus.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'hw/sysbus.c') diff --git a/hw/sysbus.c b/hw/sysbus.c index fbd2ddf39..ef3a7011e 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -105,14 +105,13 @@ static void sysbus_device_init(DeviceState *dev, DeviceInfo *base) info->init(sysbus_from_qdev(dev)); } -void sysbus_register_withprop(const char *name, size_t size, - SysBusDeviceInfo *info) +void sysbus_register_withprop(SysBusDeviceInfo *info) { info->qdev.init = sysbus_device_init; info->qdev.bus_type = BUS_TYPE_SYSTEM; - assert(size >= sizeof(SysBusDevice)); - qdev_register(name, size, &info->qdev); + assert(info->qdev.size >= sizeof(SysBusDevice)); + qdev_register(&info->qdev); } void sysbus_register_dev(const char *name, size_t size, sysbus_initfn init) @@ -120,8 +119,10 @@ void sysbus_register_dev(const char *name, size_t size, sysbus_initfn init) SysBusDeviceInfo *info; info = qemu_mallocz(sizeof(*info)); + info->qdev.name = qemu_strdup(name); + info->qdev.size = size; info->init = init; - sysbus_register_withprop(name, size, info); + sysbus_register_withprop(info); } DeviceState *sysbus_create_varargs(const char *name, -- cgit v1.2.3