[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/26] scsi esp: QOM'ify some more
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v2 18/26] scsi esp: QOM'ify some more |
Date: |
Mon, 1 Jul 2013 18:18:34 +0800 |
Introduce type constant and avoid DO_UPCAST().
Signed-off-by: Hu Tao <address@hidden>
---
hw/scsi/esp.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 0c81a50..f7d6389 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -578,6 +578,9 @@ const VMStateDescription vmstate_esp = {
}
};
+#define TYPE_ESP "esp"
+#define ESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP)
+
typedef struct {
SysBusDevice busdev;
MemoryRegion iomem;
@@ -623,8 +626,8 @@ void esp_init(hwaddr espaddr, int it_shift,
SysBusESPState *sysbus;
ESPState *esp;
- dev = qdev_create(NULL, "esp");
- sysbus = DO_UPCAST(SysBusESPState, busdev.qdev, dev);
+ dev = qdev_create(NULL, TYPE_ESP);
+ sysbus = ESP(dev);
esp = &sysbus->esp;
esp->dma_memory_read = dma_memory_read;
esp->dma_memory_write = dma_memory_write;
@@ -652,8 +655,7 @@ static const struct SCSIBusInfo esp_scsi_info = {
static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)
{
- DeviceState *d = opaque;
- SysBusESPState *sysbus = container_of(d, SysBusESPState, busdev.qdev);
+ SysBusESPState *sysbus = ESP(opaque);
ESPState *s = &sysbus->esp;
switch (irq) {
@@ -668,7 +670,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq,
int level)
static int sysbus_esp_init(SysBusDevice *dev)
{
- SysBusESPState *sysbus = FROM_SYSBUS(SysBusESPState, dev);
+ SysBusESPState *sysbus = ESP(dev);
ESPState *s = &sysbus->esp;
sysbus_init_irq(dev, &s->irq);
@@ -687,7 +689,7 @@ static int sysbus_esp_init(SysBusDevice *dev)
static void sysbus_esp_hard_reset(DeviceState *dev)
{
- SysBusESPState *sysbus = DO_UPCAST(SysBusESPState, busdev.qdev, dev);
+ SysBusESPState *sysbus = ESP(dev);
esp_hard_reset(&sysbus->esp);
}
@@ -713,7 +715,7 @@ static void sysbus_esp_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo sysbus_esp_info = {
- .name = "esp",
+ .name = TYPE_ESP,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SysBusESPState),
.class_init = sysbus_esp_class_init,
--
1.8.3.1
- [Qemu-devel] [PATCH qom-next] fdc: Improve error propagation for QOM realize, (continued)
- [Qemu-devel] [PATCH v2 12/26] pflash-cfi02: QOM'ify some more, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 14/26] ahci: QOM'ify some more, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 10/26] pflash-cfi01: QOM'ify some more, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 13/26] pflash_cfi02: use realize for pflash_cfi02, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 15/26] ahci: use realize for ahci, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 16/26] fwcfg: QOM'ify some more, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 18/26] scsi esp: QOM'ify some more,
Hu Tao <=
- [Qemu-devel] [PATCH v2 19/26] scsi esp: use realize for scsi esp, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 17/26] fwcfg: use realize for fwcfg, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 21/26] hpet: use realize for hpet, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 23/26] kvmclock: use realize for kvmclock, Hu Tao, 2013/07/01