[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/23] Add VMState support for structs
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 11/23] Add VMState support for structs |
Date: |
Thu, 20 Aug 2009 19:42:29 +0200 |
This patch adds support for saving one VMStateDescription from other
VMStateDescription.
Signed-off-by: Juan Quintela <address@hidden>
---
hw/hw.h | 12 ++++++++++++
savevm.c | 15 +++++++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/hw/hw.h b/hw/hw.h
index ebb9c22..4f63f73 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -282,6 +282,7 @@ enum VMStateFlags {
VMS_SINGLE = 0x001,
VMS_POINTER = 0x002,
VMS_ARRAY = 0x004,
+ VMS_STRUCT = 0x008,
};
typedef struct {
@@ -291,6 +292,7 @@ typedef struct {
int num;
const VMStateInfo *info;
enum VMStateFlags flags;
+ const VMStateDescription *vmsd;
int version_id;
} VMStateField;
@@ -348,6 +350,16 @@ extern const VMStateInfo vmstate_info_timer;
+ type_check_array(_type,typeof_field(_state, _field),_num) \
}
+#define VMSTATE_STRUCT(_field, _state, _version, _vmsd, _type) { \
+ .name = (stringify(_field)), \
+ .version_id = (_version), \
+ .vmsd = &(_vmsd), \
+ .size = sizeof(_type), \
+ .flags = VMS_STRUCT, \
+ .offset = offsetof(_state, _field) \
+ + type_check(_type,typeof_field(_state, _field)) \
+}
+
/* _f : field name
_n : num of elements
_s : struct state name
diff --git a/savevm.c b/savevm.c
index 040748e..8320d37 100644
--- a/savevm.c
+++ b/savevm.c
@@ -954,7 +954,13 @@ int vmstate_load_state(QEMUFile *f, const
VMStateDescription *vmsd,
}
for (i = 0; i < n_elems; i++) {
void *addr = base_addr + field->size * i;
- ret = field->info->get(f, addr, field->size);
+
+ if (field->flags & VMS_STRUCT) {
+ ret = vmstate_load_state(f, field->vmsd, addr, version_id);
+ } else {
+ ret = field->info->get(f, addr, field->size);
+
+ }
if (ret < 0) {
return ret;
}
@@ -982,7 +988,12 @@ void vmstate_save_state(QEMUFile *f, const
VMStateDescription *vmsd,
}
for (i = 0; i < n_elems; i++) {
const void *addr = base_addr + field->size * i;
- field->info->put(f, addr, field->size);
+
+ if (field->flags & VMS_STRUCT) {
+ vmstate_save_state(f, field->vmsd, addr);
+ } else {
+ field->info->put(f, addr, field->size);
+ }
}
field++;
}
--
1.6.2.5
- [Qemu-devel] [PATCH 00/23] New VMState table based load/save infrastructure, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 01/23] move useful type definitons to osdep.h, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 02/23] split do_loadvm() into do_loadvm() and load_vmstate(), Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 03/23] move do_loadvm() to monitor.c, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 04/23] make load_vmstate() return errors, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 06/23] Add vmstate_load() and vmstate_save() functions, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 05/23] Use return value from load_state() call back, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 07/23] New VMstate save/load infrastructure, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 08/23] Add VMState support for pointers, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 09/23] Add VMState support for arrays, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 11/23] Add VMState support for structs,
Juan Quintela <=
- [Qemu-devel] [PATCH 10/23] Port apic to new VMState design, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 12/23] Add VMState support for arrays of structs, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 13/23] Port i8254 to new VMState design, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 15/23] Add VMState support for variable sized arrays, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 16/23] Port PCI Bus to VMState design, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 14/23] Add VMState support for int32_t check value, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 18/23] Port PS2 devices to VMState design, Juan Quintela, 2009/08/20