From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqJY1-00017j-Hs for qemu-devel@nongnu.org; Sat, 22 Jun 2013 04:51:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UqJXy-0003bs-GU for qemu-devel@nongnu.org; Sat, 22 Jun 2013 04:51:53 -0400 Received: from [222.73.24.84] (port=8818 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqJXy-0003NV-44 for qemu-devel@nongnu.org; Sat, 22 Jun 2013 04:51:50 -0400 From: Hu Tao Date: Sat, 22 Jun 2013 16:50:29 +0800 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 17/26] scsi esp: use realize for scsi esp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Paolo Bonzini , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Paolo Bonzini Signed-off-by: Hu Tao --- hw/scsi/esp.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 0c81a50..0207dba 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -666,23 +666,33 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) } } -static int sysbus_esp_init(SysBusDevice *dev) +static void sysbus_esp_init(Object *obj) { - SysBusESPState *sysbus = FROM_SYSBUS(SysBusESPState, dev); + SysBusESPState *sysbus = DO_UPCAST(SysBusESPState, busdev.qdev.parent_obj, obj); + + memory_region_init_io(&sysbus->iomem, &sysbus_esp_mem_ops, sysbus, + "esp", ESP_REGS << sysbus->it_shift); +} + +static void sysbus_esp_realize(DeviceState *dev, Error **errp) +{ + SysBusESPState *sysbus = DO_UPCAST(SysBusESPState, busdev.qdev, dev); + SysBusDevice *sb = SYS_BUS_DEVICE(dev); ESPState *s = &sysbus->esp; - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(sb, &s->irq); assert(sysbus->it_shift != -1); s->chip_id = TCHI_FAS100A; - memory_region_init_io(&sysbus->iomem, &sysbus_esp_mem_ops, sysbus, - "esp", ESP_REGS << sysbus->it_shift); - sysbus_init_mmio(dev, &sysbus->iomem); + sysbus_init_mmio(sb, &sysbus->iomem); - qdev_init_gpio_in(&dev->qdev, sysbus_esp_gpio_demux, 2); + qdev_init_gpio_in(dev, sysbus_esp_gpio_demux, 2); - scsi_bus_new(&s->bus, &dev->qdev, &esp_scsi_info, NULL); - return scsi_bus_legacy_handle_cmdline(&s->bus); + scsi_bus_new(&s->bus, dev, &esp_scsi_info, NULL); + if (scsi_bus_legacy_handle_cmdline(&s->bus) < 0) { + error_setg(errp, "handling scsi bus failed"); + return; + } } static void sysbus_esp_hard_reset(DeviceState *dev) @@ -705,9 +715,8 @@ static const VMStateDescription vmstate_sysbus_esp_scsi = { static void sysbus_esp_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = sysbus_esp_init; + dc->realize = sysbus_esp_realize; dc->reset = sysbus_esp_hard_reset; dc->vmsd = &vmstate_sysbus_esp_scsi; } @@ -716,6 +725,7 @@ static const TypeInfo sysbus_esp_info = { .name = "esp", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(SysBusESPState), + .instance_init = sysbus_esp_init, .class_init = sysbus_esp_class_init, }; -- 1.8.3.1