OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Add VMState support for structs

Browse Source 
This patch adds support for saving one VMStateDescription from other
VMStateDescription.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-08-20 19:42:29 +02:00 committed by Anthony Liguori
parent 695dcf71eb
commit ec245e2111
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/hw.h
View File

@ -283,6 +283,7 @@ enum VMStateFlags {
VMS_SINGLE = 0x001, VMS_SINGLE = 0x001,
VMS_POINTER = 0x002, VMS_POINTER = 0x002,
VMS_ARRAY = 0x004, VMS_ARRAY = 0x004,
VMS_STRUCT = 0x008,
}; };
typedef struct { typedef struct {
@ -292,6 +293,7 @@ typedef struct {
int num; int num;
const VMStateInfo *info; const VMStateInfo *info;
enum VMStateFlags flags; enum VMStateFlags flags;
const VMStateDescription *vmsd;
int version_id; int version_id;
} VMStateField; } VMStateField;
@ -349,6 +351,16 @@ extern const VMStateInfo vmstate_info_timer;
+ type_check_array(_type,typeof_field(_state, _field),_num) \ + 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 /* _f : field name
_n : num of elements _n : num of elements
_s : struct state name _s : struct state name

15
savevm.c
View File

@ -983,7 +983,13 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
} }
for (i = 0; i < n_elems; i++) { for (i = 0; i < n_elems; i++) {
void *addr = base_addr + field->size * 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) { if (ret < 0) {
return ret; return ret;
} }
@ -1011,7 +1017,12 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
} }
for (i = 0; i < n_elems; i++) { for (i = 0; i < n_elems; i++) {
const void *addr = base_addr + field->size * 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++; field++;
} }