From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtbD5-0000Aw-5k for qemu-devel@nongnu.org; Mon, 01 Jul 2013 06:19:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UtbD0-0001JY-Uz for qemu-devel@nongnu.org; Mon, 01 Jul 2013 06:19:51 -0400 Received: from [222.73.24.84] (port=20227 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtbD0-0001Fv-BS for qemu-devel@nongnu.org; Mon, 01 Jul 2013 06:19:46 -0400 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r61AJbmh015551 for ; Mon, 1 Jul 2013 18:19:39 +0800 From: Hu Tao Date: Mon, 1 Jul 2013 18:18:34 +0800 Message-Id: <5ade28cf95b8a0d34f45fa4761d602f0ab7b825d.1372673778.git.hutao@cn.fujitsu.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH v2 18/26] scsi esp: QOM'ify some more List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Introduce type constant and avoid DO_UPCAST(). Signed-off-by: Hu Tao --- 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