motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: extend VMStateInfo

Browse source 
Current migration code cannot handle some data structures such as
QTAILQ in qemu/queue.h. Here we extend the signatures of put/get
in VMStateInfo so that customized handling is supported. put now
will return int type.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Signed-off-by: Jianjun Duan <duanj@linux.vnet.ibm.com>
Message-Id: <1484852453-12728-2-git-send-email-duanj@linux.vnet.ibm.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Jianjun Duan 2017-01-19 11:00:50 -08:00 • committed by Dr. David Alan Gilbert
parent d7fc72ceb5
commit 2c21ee769e
22 changed files with 262 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

113
migration/vmstate.c
View file

@ -6,6 +6,7 @@
#include "qemu/bitops.h"
#include "qemu/error-report.h"
#include "trace.h"
#include "migration/qjson.h"
static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, QJSON *vmdesc);
@ -122,8 +123,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
ret = vmstate_load_state(f, field->vmsd, addr,
field->vmsd->version_id);
} else {
ret = field->info->get(f, addr, size);
ret = field->info->get(f, addr, size, field);
}
if (ret >= 0) {
ret = qemu_file_get_error(f);
@ -330,7 +330,7 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
if (field->flags & VMS_STRUCT) {
vmstate_save_state(f, field->vmsd, addr, vmdesc_loop);
} else {
field->info->put(f, addr, size);
field->info->put(f, addr, size, field, vmdesc_loop);
}
written_bytes = qemu_ftell_fast(f) - old_offset;
@ -463,17 +463,19 @@ static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,
/* bool */
static int get_bool(QEMUFile *f, void *pv, size_t size)
static int get_bool(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
bool *v = pv;
*v = qemu_get_byte(f);
return 0;
}
static void put_bool(QEMUFile *f, void *pv, size_t size)
static int put_bool(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
bool *v = pv;
qemu_put_byte(f, *v);
return 0;
}
const VMStateInfo vmstate_info_bool = {
@ -484,17 +486,19 @@ const VMStateInfo vmstate_info_bool = {
/* 8 bit int */
static int get_int8(QEMUFile *f, void *pv, size_t size)
static int get_int8(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
int8_t *v = pv;
qemu_get_s8s(f, v);
return 0;
}
static void put_int8(QEMUFile *f, void *pv, size_t size)
static int put_int8(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
int8_t *v = pv;
qemu_put_s8s(f, v);
return 0;
}
const VMStateInfo vmstate_info_int8 = {
@ -505,17 +509,19 @@ const VMStateInfo vmstate_info_int8 = {
/* 16 bit int */
static int get_int16(QEMUFile *f, void *pv, size_t size)
static int get_int16(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
int16_t *v = pv;
qemu_get_sbe16s(f, v);
return 0;
}
static void put_int16(QEMUFile *f, void *pv, size_t size)
static int put_int16(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
int16_t *v = pv;
qemu_put_sbe16s(f, v);
return 0;
}
const VMStateInfo vmstate_info_int16 = {
@ -526,17 +532,19 @@ const VMStateInfo vmstate_info_int16 = {
/* 32 bit int */
static int get_int32(QEMUFile *f, void *pv, size_t size)
static int get_int32(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
int32_t *v = pv;
qemu_get_sbe32s(f, v);
return 0;
}
static void put_int32(QEMUFile *f, void *pv, size_t size)
static int put_int32(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
int32_t *v = pv;
qemu_put_sbe32s(f, v);
return 0;
}
const VMStateInfo vmstate_info_int32 = {
@ -548,7 +556,8 @@ const VMStateInfo vmstate_info_int32 = {
/* 32 bit int. See that the received value is the same than the one
in the field */
static int get_int32_equal(QEMUFile *f, void *pv, size_t size)
static int get_int32_equal(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
int32_t *v = pv;
int32_t v2;
@ -571,7 +580,7 @@ const VMStateInfo vmstate_info_int32_equal = {
* and less than or equal to the one in the field.
*/
static int get_int32_le(QEMUFile *f, void *pv, size_t size)
static int get_int32_le(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
int32_t *cur = pv;
int32_t loaded;
@ -595,17 +604,19 @@ const VMStateInfo vmstate_info_int32_le = {
/* 64 bit int */
static int get_int64(QEMUFile *f, void *pv, size_t size)
static int get_int64(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
int64_t *v = pv;
qemu_get_sbe64s(f, v);
return 0;
}
static void put_int64(QEMUFile *f, void *pv, size_t size)
static int put_int64(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
int64_t *v = pv;
qemu_put_sbe64s(f, v);
return 0;
}
const VMStateInfo vmstate_info_int64 = {
@ -616,17 +627,19 @@ const VMStateInfo vmstate_info_int64 = {
/* 8 bit unsigned int */
static int get_uint8(QEMUFile *f, void *pv, size_t size)
static int get_uint8(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
uint8_t *v = pv;
qemu_get_8s(f, v);
return 0;
}
static void put_uint8(QEMUFile *f, void *pv, size_t size)
static int put_uint8(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
uint8_t *v = pv;
qemu_put_8s(f, v);
return 0;
}
const VMStateInfo vmstate_info_uint8 = {
@ -637,17 +650,19 @@ const VMStateInfo vmstate_info_uint8 = {
/* 16 bit unsigned int */
static int get_uint16(QEMUFile *f, void *pv, size_t size)
static int get_uint16(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
uint16_t *v = pv;
qemu_get_be16s(f, v);
return 0;
}
static void put_uint16(QEMUFile *f, void *pv, size_t size)
static int put_uint16(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
uint16_t *v = pv;
qemu_put_be16s(f, v);
return 0;
}
const VMStateInfo vmstate_info_uint16 = {
@ -658,17 +673,19 @@ const VMStateInfo vmstate_info_uint16 = {
/* 32 bit unsigned int */
static int get_uint32(QEMUFile *f, void *pv, size_t size)
static int get_uint32(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
uint32_t *v = pv;
qemu_get_be32s(f, v);
return 0;
}
static void put_uint32(QEMUFile *f, void *pv, size_t size)
static int put_uint32(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
uint32_t *v = pv;
qemu_put_be32s(f, v);
return 0;
}
const VMStateInfo vmstate_info_uint32 = {
@ -680,7 +697,8 @@ const VMStateInfo vmstate_info_uint32 = {
/* 32 bit uint. See that the received value is the same than the one
in the field */
static int get_uint32_equal(QEMUFile *f, void *pv, size_t size)
static int get_uint32_equal(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
uint32_t *v = pv;
uint32_t v2;
@ -701,17 +719,19 @@ const VMStateInfo vmstate_info_uint32_equal = {
/* 64 bit unsigned int */
static int get_uint64(QEMUFile *f, void *pv, size_t size)
static int get_uint64(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
uint64_t *v = pv;
qemu_get_be64s(f, v);
return 0;
}
static void put_uint64(QEMUFile *f, void *pv, size_t size)
static int put_uint64(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
uint64_t *v = pv;
qemu_put_be64s(f, v);
return 0;
}
const VMStateInfo vmstate_info_uint64 = {
@ -723,7 +743,8 @@ const VMStateInfo vmstate_info_uint64 = {
/* 64 bit unsigned int. See that the received value is the same than the one
in the field */
static int get_uint64_equal(QEMUFile *f, void *pv, size_t size)
static int get_uint64_equal(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
uint64_t *v = pv;
uint64_t v2;
@ -745,7 +766,8 @@ const VMStateInfo vmstate_info_uint64_equal = {
/* 8 bit int. See that the received value is the same than the one
in the field */
static int get_uint8_equal(QEMUFile *f, void *pv, size_t size)
static int get_uint8_equal(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
uint8_t *v = pv;
uint8_t v2;
@ -767,7 +789,8 @@ const VMStateInfo vmstate_info_uint8_equal = {
/* 16 bit unsigned int int. See that the received value is the same than the one
in the field */
static int get_uint16_equal(QEMUFile *f, void *pv, size_t size)
static int get_uint16_equal(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
uint16_t *v = pv;
uint16_t v2;
@ -788,7 +811,8 @@ const VMStateInfo vmstate_info_uint16_equal = {
/* floating point */
static int get_float64(QEMUFile *f, void *pv, size_t size)
static int get_float64(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
float64 *v = pv;
@ -796,11 +820,13 @@ static int get_float64(QEMUFile *f, void *pv, size_t size)
return 0;
}
static void put_float64(QEMUFile *f, void *pv, size_t size)
static int put_float64(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
uint64_t *v = pv;
qemu_put_be64(f, float64_val(*v));
return 0;
}
const VMStateInfo vmstate_info_float64 = {
@ -811,7 +837,8 @@ const VMStateInfo vmstate_info_float64 = {
/* CPU_DoubleU type */
static int get_cpudouble(QEMUFile *f, void *pv, size_t size)
static int get_cpudouble(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
CPU_DoubleU *v = pv;
qemu_get_be32s(f, &v->l.upper);
@ -819,11 +846,13 @@ static int get_cpudouble(QEMUFile *f, void *pv, size_t size)
return 0;
}
static void put_cpudouble(QEMUFile *f, void *pv, size_t size)
static int put_cpudouble(QEMUFile *f, void *pv, size_t size,
VMStateField *field, QJSON *vmdesc)
{
CPU_DoubleU *v = pv;
qemu_put_be32s(f, &v->l.upper);
qemu_put_be32s(f, &v->l.lower);
return 0;
}
const VMStateInfo vmstate_info_cpudouble = {
@ -834,17 +863,20 @@ const VMStateInfo vmstate_info_cpudouble = {
/* uint8_t buffers */
static int get_buffer(QEMUFile *f, void *pv, size_t size)
static int get_buffer(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
uint8_t *v = pv;
qemu_get_buffer(f, v, size);
return 0;
}
static void put_buffer(QEMUFile *f, void *pv, size_t size)
static int put_buffer(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
uint8_t *v = pv;
qemu_put_buffer(f, v, size);
return 0;
}
const VMStateInfo vmstate_info_buffer = {
@ -856,7 +888,8 @@ const VMStateInfo vmstate_info_buffer = {
/* unused buffers: space that was used for some fields that are
not useful anymore */
static int get_unused_buffer(QEMUFile *f, void *pv, size_t size)
static int get_unused_buffer(QEMUFile *f, void *pv, size_t size,
VMStateField *field)
{
uint8_t buf[1024];
int block_len;
@ -869,7 +902,8 @@ static int get_unused_buffer(QEMUFile *f, void *pv, size_t size)
return 0;
}
static void put_unused_buffer(QEMUFile *f, void *pv, size_t size)
static int put_unused_buffer(QEMUFile *f, void *pv, size_t size,
VMStateField *field, QJSON *vmdesc)
{
static const uint8_t buf[1024];
int block_len;
@ -879,6 +913,8 @@ static void put_unused_buffer(QEMUFile *f, void *pv, size_t size)
size -= block_len;
qemu_put_buffer(f, buf, block_len);
}
return 0;
}
const VMStateInfo vmstate_info_unused_buffer = {
@ -894,7 +930,7 @@ const VMStateInfo vmstate_info_unused_buffer = {
*/
/* This is the number of 64 bit words sent over the wire */
#define BITS_TO_U64S(nr) DIV_ROUND_UP(nr, 64)
static int get_bitmap(QEMUFile *f, void *pv, size_t size)
static int get_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField *field)
{
unsigned long *bmp = pv;
int i, idx = 0;
@ -908,7 +944,8 @@ static int get_bitmap(QEMUFile *f, void *pv, size_t size)
return 0;
}
static void put_bitmap(QEMUFile *f, void *pv, size_t size)
static int put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
unsigned long *bmp = pv;
int i, idx = 0;
@ -919,6 +956,8 @@ static void put_bitmap(QEMUFile *f, void *pv, size_t size)
}
qemu_put_be64(f, w);
}
return 0;
}
const VMStateInfo vmstate_info_bitmap = {