[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/23] Add VMState support for variable sized arrays
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 15/23] Add VMState support for variable sized arrays |
Date: |
Thu, 20 Aug 2009 19:42:33 +0200 |
This patch add supports for variable sized arrays whose size is
another field of the state.
Signed-off-by: Juan Quintela <address@hidden>
---
hw/hw.h | 22 ++++++++++++++++++++++
savevm.c | 4 ++++
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/hw/hw.h b/hw/hw.h
index e3e9d5b..911ab6f 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -283,6 +283,7 @@ enum VMStateFlags {
VMS_POINTER = 0x002,
VMS_ARRAY = 0x004,
VMS_STRUCT = 0x008,
+ VMS_VARRAY = 0x010, /* Array with size in another field */
};
typedef struct {
@@ -290,6 +291,7 @@ typedef struct {
size_t offset;
size_t size;
int num;
+ size_t num_offset;
const VMStateInfo *info;
enum VMStateFlags flags;
const VMStateDescription *vmsd;
@@ -320,6 +322,7 @@ 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 type_check_pointer(t1,t2) ((t1**)0 - (t2*)0)
#define VMSTATE_SINGLE(_field, _state, _version, _info, _type) { \
.name = (stringify(_field)), \
@@ -352,6 +355,18 @@ extern const VMStateInfo vmstate_info_timer;
+ type_check_array(_type,typeof_field(_state, _field),_num) \
}
+#define VMSTATE_VARRAY(_field, _state, _field_num, _version, _info, _type) {\
+ .name = (stringify(_field)), \
+ .version_id = (_version), \
+ .num_offset = offsetof(_state, _field_num) \
+ + type_check(int32_t,typeof_field(_state, _field_num)), \
+ .info = &(_info), \
+ .size = sizeof(_type), \
+ .flags = VMS_VARRAY|VMS_POINTER, \
+ .offset = offsetof(_state, _field) \
+ + type_check_pointer(_type,typeof_field(_state, _field)) \
+}
+
#define VMSTATE_STRUCT(_field, _state, _version, _vmsd, _type) { \
.name = (stringify(_field)), \
.version_id = (_version), \
@@ -374,6 +389,7 @@ extern const VMStateInfo vmstate_info_timer;
}
/* _f : field name
+ _f_n : num of elements field_name
_n : num of elements
_s : struct state name
_v : version
@@ -436,6 +452,12 @@ extern const VMStateInfo vmstate_info_timer;
#define VMSTATE_INT32_ARRAY(_f, _s, _n) \
VMSTATE_INT32_ARRAY_V(_f, _s, _n, 0)
+#define VMSTATE_INT32_VARRAY_V(_f, _s, _f_n, _v) \
+ VMSTATE_VARRAY(_f, _s, _f_n, _v, vmstate_info_int32, int32_t)
+
+#define VMSTATE_INT32_VARRAY(_f, _s, _f_n) \
+ VMSTATE_INT32_VARRAY_V(_f, _s, _f_n, 0)
+
#define VMSTATE_END_OF_LIST() \
{}
diff --git a/savevm.c b/savevm.c
index e443f00..721bbf4 100644
--- a/savevm.c
+++ b/savevm.c
@@ -968,6 +968,8 @@ int vmstate_load_state(QEMUFile *f, const
VMStateDescription *vmsd,
if (field->flags & VMS_ARRAY) {
n_elems = field->num;
+ } else if (field->flags & VMS_VARRAY) {
+ n_elems = *(size_t *)(opaque+field->num_offset);
}
if (field->flags & VMS_POINTER) {
base_addr = *(void **)base_addr;
@@ -1002,6 +1004,8 @@ void vmstate_save_state(QEMUFile *f, const
VMStateDescription *vmsd,
if (field->flags & VMS_ARRAY) {
n_elems = field->num;
+ } else if (field->flags & VMS_VARRAY) {
+ n_elems = *(size_t *)(opaque+field->num_offset);
}
if (field->flags & VMS_POINTER) {
base_addr = *(void **)base_addr;
--
1.6.2.5
- [Qemu-devel] [PATCH 04/23] make load_vmstate() return errors, (continued)
- [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, 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 <=
- [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
- [Qemu-devel] [PATCH 17/23] Add VMState support for static sized buffers (uint_8), Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 19/23] Add VMState support for int32_t check value, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 22/23] Add VMState support to run a function after load, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 21/23] Port PCIDevice state to VMState, Juan Quintela, 2009/08/20