summaryrefslogtreecommitdiff
path: root/hw/nvram
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-27 12:50:29 +0200
committerAndreas Färber <afaerber@suse.de>2013-07-29 21:07:00 +0200
commit8c1892cf7297ff4972a4ad6dd601921c3a01d618 (patch)
treecfd245b992ed828b2135604713d4ca644c338f48 /hw/nvram
parent14134f0eb57247e3ec3b8311931a11b344096591 (diff)
downloadqemu-8c1892cf7297ff4972a4ad6dd601921c3a01d618.tar.gz
ds1225y: QOM cast cleanup for SysBusNvRamState
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/nvram')
-rw-r--r--hw/nvram/ds1225y.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index cca6f4385b..f9a700b01c 100644
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -104,14 +104,19 @@ static const VMStateDescription vmstate_nvram = {
}
};
+#define TYPE_DS1225Y "ds1225y"
+#define DS1225Y(obj) OBJECT_CHECK(SysBusNvRamState, (obj), TYPE_DS1225Y)
+
typedef struct {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
NvRamState nvram;
} SysBusNvRamState;
static int nvram_sysbus_initfn(SysBusDevice *dev)
{
- NvRamState *s = &FROM_SYSBUS(SysBusNvRamState, dev)->nvram;
+ SysBusNvRamState *sys = DS1225Y(dev);
+ NvRamState *s = &sys->nvram;
FILE *file;
s->contents = g_malloc0(s->chip_size);
@@ -151,7 +156,7 @@ static void nvram_sysbus_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo nvram_sysbus_info = {
- .name = "ds1225y",
+ .name = TYPE_DS1225Y,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SysBusNvRamState),
.class_init = nvram_sysbus_class_init,