[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/23] Add VMState support for arrays
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 09/23] Add VMState support for arrays |
Date: |
Thu, 20 Aug 2009 19:42:27 +0200 |
This patch adds support for saving arrays inside the struct
Signed-off-by: Juan Quintela <address@hidden>
---
hw/hw.h | 28 ++++++++++++++++++++++++++++
savevm.c | 31 ++++++++++++++++++++++---------
2 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/hw/hw.h b/hw/hw.h
index a315f83..ebb9c22 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -281,12 +281,14 @@ struct VMStateInfo {
enum VMStateFlags {
VMS_SINGLE = 0x001,
VMS_POINTER = 0x002,
+ VMS_ARRAY = 0x004,
};
typedef struct {
const char *name;
size_t offset;
size_t size;
+ int num;
const VMStateInfo *info;
enum VMStateFlags flags;
int version_id;
@@ -313,6 +315,8 @@ extern const VMStateInfo vmstate_info_uint64;
extern const VMStateInfo vmstate_info_timer;
+#define type_check_array(t1,t2,n) ((t1(*)[n])0 - (t2*)0)
+
#define VMSTATE_SINGLE(_field, _state, _version, _info, _type) { \
.name = (stringify(_field)), \
.version_id = (_version), \
@@ -333,7 +337,19 @@ extern const VMStateInfo vmstate_info_timer;
+ type_check(_type,typeof_field(_state, _field)) \
}
+#define VMSTATE_ARRAY(_field, _state, _num, _version, _info, _type) {\
+ .name = (stringify(_field)), \
+ .version_id = (_version), \
+ .num = (_num), \
+ .info = &(_info), \
+ .size = sizeof(_type), \
+ .flags = VMS_ARRAY, \
+ .offset = offsetof(_state, _field) \
+ + type_check_array(_type,typeof_field(_state, _field),_num) \
+}
+
/* _f : field name
+ _n : num of elements
_s : struct state name
_v : version
*/
@@ -380,6 +396,18 @@ extern const VMStateInfo vmstate_info_timer;
#define VMSTATE_TIMER(_f, _s) \
VMSTATE_TIMER_V(_f, _s, 0)
+#define VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) \
+ VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_uint32, uint32_t)
+
+#define VMSTATE_UINT32_ARRAY(_f, _s, _n) \
+ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, 0)
+
+#define VMSTATE_INT32_ARRAY_V(_f, _s, _n, _v) \
+ VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int32, int32_t)
+
+#define VMSTATE_INT32_ARRAY(_f, _s, _n) \
+ VMSTATE_INT32_ARRAY_V(_f, _s, _n, 0)
+
#define VMSTATE_END_OF_LIST() \
{}
diff --git a/savevm.c b/savevm.c
index 617b443..040748e 100644
--- a/savevm.c
+++ b/savevm.c
@@ -943,15 +943,21 @@ int vmstate_load_state(QEMUFile *f, const
VMStateDescription *vmsd,
}
while(field->name) {
if (field->version_id <= version_id) {
- void *addr = opaque + field->offset;
- int ret;
+ void *base_addr = opaque + field->offset;
+ int ret, i, n_elems = 1;
+ if (field->flags & VMS_ARRAY) {
+ n_elems = field->num;
+ }
if (field->flags & VMS_POINTER) {
- addr = *(void **)addr;
+ base_addr = *(void **)base_addr;
}
- ret = field->info->get(f, addr, field->size);
- if (ret < 0) {
- return ret;
+ for (i = 0; i < n_elems; i++) {
+ void *addr = base_addr + field->size * i;
+ ret = field->info->get(f, addr, field->size);
+ if (ret < 0) {
+ return ret;
+ }
}
}
field++;
@@ -965,12 +971,19 @@ void vmstate_save_state(QEMUFile *f, const
VMStateDescription *vmsd,
VMStateField *field = vmsd->fields;
while(field->name) {
- const void *addr = opaque + field->offset;
+ const void *base_addr = opaque + field->offset;
+ int i, n_elems = 1;
+ if (field->flags & VMS_ARRAY) {
+ n_elems = field->num;
+ }
if (field->flags & VMS_POINTER) {
- addr = *(void **)addr;
+ base_addr = *(void **)base_addr;
+ }
+ for (i = 0; i < n_elems; i++) {
+ const void *addr = base_addr + field->size * i;
+ field->info->put(f, addr, field->size);
}
- 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 <=
- [Qemu-devel] [PATCH 11/23] Add VMState support for structs, Juan Quintela, 2009/08/20
- [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