[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/26] pflash-cfi01: QOM'ify some more
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v2 10/26] pflash-cfi01: QOM'ify some more |
Date: |
Mon, 1 Jul 2013 18:18:26 +0800 |
Introduce type constant and replace FROM_SYSBUS().
Signed-off-by: Hu Tao <address@hidden>
---
hw/block/pflash_cfi01.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 63d7c99..7f7af06 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -60,6 +60,9 @@ do { \
#define DPRINTF(fmt, ...) do { } while (0)
#endif
+#define TYPE_CFI_PFLASH01 "cfi.pflash01"
+#define CFI_PFLASH01(obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH01)
+
struct pflash_t {
SysBusDevice busdev;
BlockDriverState *bs;
@@ -565,7 +568,7 @@ static const MemoryRegionOps pflash_cfi01_ops_le = {
static int pflash_cfi01_init(SysBusDevice *dev)
{
- pflash_t *pfl = FROM_SYSBUS(typeof(*pfl), dev);
+ pflash_t *pfl = CFI_PFLASH01(dev);
uint64_t total_len;
int ret;
@@ -719,7 +722,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass,
void *data)
static const TypeInfo pflash_cfi01_info = {
- .name = "cfi.pflash01",
+ .name = TYPE_CFI_PFLASH01,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(struct pflash_t),
.class_init = pflash_cfi01_class_init,
@@ -740,10 +743,7 @@ pflash_t *pflash_cfi01_register(hwaddr base,
uint16_t id0, uint16_t id1,
uint16_t id2, uint16_t id3, int be)
{
- DeviceState *dev = qdev_create(NULL, "cfi.pflash01");
- SysBusDevice *busdev = SYS_BUS_DEVICE(dev);
- pflash_t *pfl = (pflash_t *)object_dynamic_cast(OBJECT(dev),
- "cfi.pflash01");
+ DeviceState *dev = qdev_create(NULL, TYPE_CFI_PFLASH01);
if (bs && qdev_prop_set_drive(dev, "drive", bs)) {
abort();
@@ -759,8 +759,8 @@ pflash_t *pflash_cfi01_register(hwaddr base,
qdev_prop_set_string(dev, "name", name);
qdev_init_nofail(dev);
- sysbus_mmio_map(busdev, 0, base);
- return pfl;
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
+ return CFI_PFLASH01(dev);
}
MemoryRegion *pflash_cfi01_get_memory(pflash_t *fl)
--
1.8.3.1
- [Qemu-devel] [PATCH v2 07/26] q35: use realize for q35 host, (continued)
- [Qemu-devel] [PATCH v2 07/26] q35: use realize for q35 host, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 11/26] pflash_cfi01: use realize for pflash_cfi01, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 09/26] fdc: use realize for fdc., Hu Tao, 2013/07/01
- [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 <=
- [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, 2013/07/01
- [Qemu-devel] [PATCH v2 19/26] scsi esp: use realize for scsi esp, Hu Tao, 2013/07/01