[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 5/6] sun4u: QOM cast cleanup for PR
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 5/6] sun4u: QOM cast cleanup for PROMState |
Date: |
Sat, 27 Jul 2013 13:55:55 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/sparc64/sun4u.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 34a5e73..9568028 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -632,8 +632,12 @@ static const TypeInfo ebus_info = {
.class_init = ebus_class_init,
};
+#define TYPE_OPENPROM "openprom"
+#define OPENPROM(obj) OBJECT_CHECK(PROMState, (obj), TYPE_OPENPROM)
+
typedef struct PROMState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion prom;
} PROMState;
@@ -651,7 +655,7 @@ static void prom_init(hwaddr addr, const char *bios_name)
char *filename;
int ret;
- dev = qdev_create(NULL, "openprom");
+ dev = qdev_create(NULL, TYPE_OPENPROM);
qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev);
@@ -680,7 +684,7 @@ static void prom_init(hwaddr addr, const char *bios_name)
static int prom_init1(SysBusDevice *dev)
{
- PROMState *s = FROM_SYSBUS(PROMState, dev);
+ PROMState *s = OPENPROM(dev);
memory_region_init_ram(&s->prom, OBJECT(s), "sun4u.prom", PROM_SIZE_MAX);
vmstate_register_ram_global(&s->prom);
@@ -703,7 +707,7 @@ static void prom_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo prom_info = {
- .name = "openprom",
+ .name = TYPE_OPENPROM,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PROMState),
.class_init = prom_class_init,
--
1.8.1.4
- [Qemu-devel] [PATCH qom-next for-1.6 0/6] sparc: QOM cast cleanups, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 2/6] sun4m: QOM cast cleanup for AFXState, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 4/6] sun4m: QOM cast cleanup for RamDevice, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 1/6] sun4m: QOM cast cleanup for IDRegState, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 6/6] sun4u: QOM cast cleanup for RamDevice, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 5/6] sun4u: QOM cast cleanup for PROMState,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next for-1.6 3/6] sun4m: QOM cast cleanup for PROMState, Andreas Färber, 2013/07/27