[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 48/55] scsi/esp: Use QOM realize for scsi esp
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 48/55] scsi/esp: Use QOM realize for scsi esp |
Date: |
Tue, 23 Jul 2013 01:46:29 +0200 |
From: Hu Tao <address@hidden>
Signed-off-by: Hu Tao <address@hidden>
[AF: Drop sysbus_esp_init()]
Signed-off-by: Andreas Färber <address@hidden>
---
hw/scsi/esp.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 1a2d72c..c24b632 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -671,23 +671,27 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq,
int level)
}
}
-static int sysbus_esp_init(SysBusDevice *dev)
+static void sysbus_esp_realize(DeviceState *dev, Error **errp)
{
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
SysBusESPState *sysbus = ESP(dev);
ESPState *s = &sysbus->esp;
- sysbus_init_irq(dev, &s->irq);
+ sysbus_init_irq(sbd, &s->irq);
assert(sysbus->it_shift != -1);
s->chip_id = TCHI_FAS100A;
memory_region_init_io(&sysbus->iomem, OBJECT(sysbus), &sysbus_esp_mem_ops,
sysbus, "esp", ESP_REGS << sysbus->it_shift);
- sysbus_init_mmio(dev, &sysbus->iomem);
+ sysbus_init_mmio(sbd, &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 legacy SCSI command line failed");
+ return;
+ }
}
static void sysbus_esp_hard_reset(DeviceState *dev)
@@ -710,9 +714,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;
}
--
1.8.1.4
- [Qemu-devel] [PULL 38/55] fwcfg: QOM'ify some more, (continued)
- [Qemu-devel] [PULL 38/55] fwcfg: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 37/55] ahci: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 39/55] scsi/esp: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 41/55] kvm/clock: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 40/55] hpet: QOM'ify some more, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 44/55] pflash_cfi01: Use QOM realize for pflash_cfi01, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 45/55] pflash_cfi02: Use QOM realize for pflash_cfi02, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 42/55] fdc: Use QOM realize for fdc, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 43/55] fdc: Improve error propagation for QOM realize, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 46/55] ahci: Use QOM realize for ahci, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 48/55] scsi/esp: Use QOM realize for scsi esp,
Andreas Färber <=
- [Qemu-devel] [PULL 49/55] megasas: Legacy command line handling fix, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 47/55] fw_cfg: Use QOM realize for fw_cfg, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 52/55] kvm/clock: Use QOM realize for kvmclock, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 51/55] hpet: Use QOM realize for hpet, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 53/55] kvmvapic: Use QOM realize, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 54/55] ioapic: Use QOM realize for ioapic, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 50/55] scsi: Improve error propagation for scsi_bus_legacy_handle_cmdline(), Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 55/55] isa-bus: Drop isabus_bridge_init() since it does nothing, Andreas Färber, 2013/07/22