* [Qemu-devel] [PATCH qom-next for-1.6 0/2] nvram: QOM cast cleanups
@ 2013-07-27 10:51 Andreas Färber
2013-07-27 10:51 ` [Qemu-devel] [PATCH qom-next for-1.6 1/2] ds1225y: Drop bogus qdev field from NvRamState Andreas Färber
2013-07-27 10:51 ` [Qemu-devel] [PATCH qom-next for-1.6 2/2] ds1225y: QOM cast cleanup Andreas Färber
0 siblings, 2 replies; 3+ messages in thread
From: Andreas Färber @ 2013-07-27 10:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Hu Tao, Andreas Färber
Hello,
This series eliminates FROM_SYSBUS() in hw/nvram/.
Regards,
Andreas
Cc: Hu Tao <hutao@cn.fujitsu.com>
Andreas Färber (2):
ds1225y: Drop bogus qdev field from NvRamState
ds1225y: QOM cast cleanup
hw/nvram/ds1225y.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--
1.8.1.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH qom-next for-1.6 1/2] ds1225y: Drop bogus qdev field from NvRamState
2013-07-27 10:51 [Qemu-devel] [PATCH qom-next for-1.6 0/2] nvram: QOM cast cleanups Andreas Färber
@ 2013-07-27 10:51 ` Andreas Färber
2013-07-27 10:51 ` [Qemu-devel] [PATCH qom-next for-1.6 2/2] ds1225y: QOM cast cleanup Andreas Färber
1 sibling, 0 replies; 3+ messages in thread
From: Andreas Färber @ 2013-07-27 10:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Andreas Färber
It is not a device, and the field is not used from code either.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
hw/nvram/ds1225y.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index fa218ce..cca6f43 100644
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -26,7 +26,6 @@
#include "trace.h"
typedef struct {
- DeviceState qdev;
MemoryRegion iomem;
uint32_t chip_size;
char *filename;
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH qom-next for-1.6 2/2] ds1225y: QOM cast cleanup
2013-07-27 10:51 [Qemu-devel] [PATCH qom-next for-1.6 0/2] nvram: QOM cast cleanups Andreas Färber
2013-07-27 10:51 ` [Qemu-devel] [PATCH qom-next for-1.6 1/2] ds1225y: Drop bogus qdev field from NvRamState Andreas Färber
@ 2013-07-27 10:51 ` Andreas Färber
1 sibling, 0 replies; 3+ messages in thread
From: Andreas Färber @ 2013-07-27 10:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Andreas Färber
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
hw/nvram/ds1225y.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index cca6f43..f9a700b 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,
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-27 12:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-27 10:51 [Qemu-devel] [PATCH qom-next for-1.6 0/2] nvram: QOM cast cleanups Andreas Färber
2013-07-27 10:51 ` [Qemu-devel] [PATCH qom-next for-1.6 1/2] ds1225y: Drop bogus qdev field from NvRamState Andreas Färber
2013-07-27 10:51 ` [Qemu-devel] [PATCH qom-next for-1.6 2/2] ds1225y: QOM cast cleanup Andreas Färber
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.