ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add VMState support for pointers 

This patch adds support for saving pointers to values

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:26 +02:00 committed by Anthony Liguori
parent 9ed7d6ae0f
commit dde0463b4e
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/hw.h
View File

@ -281,6 +281,7 @@ struct VMStateInfo {
enum VMStateFlags { enum VMStateFlags {
VMS_SINGLE = 0x001, VMS_SINGLE = 0x001,
VMS_POINTER = 0x002,
}; };
typedef struct { typedef struct {
@ -311,6 +312,8 @@ extern const VMStateInfo vmstate_info_uint16;
extern const VMStateInfo vmstate_info_uint32; extern const VMStateInfo vmstate_info_uint32;
extern const VMStateInfo vmstate_info_uint64; extern const VMStateInfo vmstate_info_uint64;
extern const VMStateInfo vmstate_info_timer;
#define VMSTATE_SINGLE(_field, _state, _version, _info, _type) { \ #define VMSTATE_SINGLE(_field, _state, _version, _info, _type) { \
.name = (stringify(_field)), \ .name = (stringify(_field)), \
.version_id = (_version), \ .version_id = (_version), \
@ -321,6 +324,16 @@ extern const VMStateInfo vmstate_info_uint64;
+ type_check(_type,typeof_field(_state, _field)) \ + type_check(_type,typeof_field(_state, _field)) \
} }
#define VMSTATE_POINTER(_field, _state, _version, _info, _type) { \
.name = (stringify(_field)), \
.version_id = (_version), \
.info = &(_info), \
.size = sizeof(_type), \
.flags = VMS_SINGLE|VMS_POINTER, \
.offset = offsetof(_state, _field) \
+ type_check(_type,typeof_field(_state, _field)) \
}
/* _f : field name /* _f : field name
_s : struct state name _s : struct state name
_v : version _v : version
@ -362,6 +375,12 @@ extern const VMStateInfo vmstate_info_uint64;
#define VMSTATE_UINT64(_f, _s) \ #define VMSTATE_UINT64(_f, _s) \
VMSTATE_UINT64_V(_f, _s, 0) VMSTATE_UINT64_V(_f, _s, 0)
#define VMSTATE_TIMER_V(_f, _s, _v) \
VMSTATE_POINTER(_f, _s, _v, vmstate_info_timer, QEMUTimer *)
#define VMSTATE_TIMER(_f, _s) \
VMSTATE_TIMER_V(_f, _s, 0)
#define VMSTATE_END_OF_LIST() \ #define VMSTATE_END_OF_LIST() \
{} {}

28
savevm.c
View File

@ -807,6 +807,27 @@ const VMStateInfo vmstate_info_uint64 = {
.put = put_uint64, .put = put_uint64,
}; };
/* timers */
static int get_timer(QEMUFile *f, void *pv, size_t size)
{
QEMUTimer *v = pv;
qemu_get_timer(f, v);
return 0;
}
static void put_timer(QEMUFile *f, const void *pv, size_t size)
{
QEMUTimer *v = (void *)pv;
qemu_put_timer(f, v);
}
const VMStateInfo vmstate_info_timer = {
.name = "timer",
.get = get_timer,
.put = put_timer,
};
typedef struct SaveStateEntry { typedef struct SaveStateEntry {
char idstr[256]; char idstr[256];
int instance_id; int instance_id;
@ -954,6 +975,9 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
void *addr = opaque + field->offset; void *addr = opaque + field->offset;
int ret; int ret;
if (field->flags & VMS_POINTER) {
addr = *(void **)addr;
}
ret = field->info->get(f, addr, field->size); ret = field->info->get(f, addr, field->size);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
@ -971,6 +995,10 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
while(field->name) { while(field->name) {
const void *addr = opaque + field->offset; const void *addr = opaque + field->offset;
if (field->flags & VMS_POINTER) {
addr = *(void **)addr;
}
field->info->put(f, addr, field->size); field->info->put(f, addr, field->size);
field++; field++;
} }