* Juan Quintela (quint...@redhat.com) wrote:
> Now one just has the interperter, and the other has the basic types.
> Once there, add copyright boilerplate.
>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
I think this is generally OK, but as discussed on IRC, I think
you need to check the licenses.
Dave
> ---
> migration/Makefile.objs | 2 +-
> migration/vmstate-types.c | 676
> ++++++++++++++++++++++++++++++++++++++++++++++
> migration/vmstate.c | 669 ++-------------------------------------------
> tests/Makefile.include | 2 +-
> 4 files changed, 705 insertions(+), 644 deletions(-)
> create mode 100644 migration/vmstate-types.c
>
> diff --git a/migration/Makefile.objs b/migration/Makefile.objs
> index ce8ce12..812b2ec 100644
> --- a/migration/Makefile.objs
> +++ b/migration/Makefile.objs
> @@ -1,7 +1,7 @@
> common-obj-y += migration.o socket.o fd.o exec.o
> common-obj-y += tls.o channel.o
> common-obj-y += colo-comm.o colo.o colo-failover.o
> -common-obj-y += vmstate.o page_cache.o
> +common-obj-y += vmstate.o vmstate-types.o page_cache.o
> common-obj-y += qemu-file.o
> common-obj-y += qemu-file-channel.o
> common-obj-y += xbzrle.o postcopy-ram.o
> diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
> new file mode 100644
> index 0000000..0cf14d4
> --- /dev/null
> +++ b/migration/vmstate-types.c
> @@ -0,0 +1,676 @@
> +/*
> + * QEMU System Emulator
> + *
> + * Copyright (c) 2009-2017 Red Hat Inc
> + *
> + * Authors:
> + * Juan Quintela <quint...@redhat.com>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> copy
> + * of this software and associated documentation files (the "Software"), to
> deal
> + * in the Software without restriction, including without limitation the
> rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu-common.h"
> +#include "migration/migration.h"
> +#include "migration/qemu-file.h"
> +#include "migration/vmstate.h"
> +#include "qemu/error-report.h"
> +#include "qemu/queue.h"
> +#include "trace.h"
> +
> +/* bool */
> +
> +static int get_bool(QEMUFile *f, void *pv, size_t size, VMStateField *field)
> +{
> + bool *v = pv;
> + *v = qemu_get_byte(f);
> + return 0;
> +}
> +
> +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 = {
> + .name = "bool",
> + .get = get_bool,
> + .put = put_bool,
> +};
> +
> +/* 8 bit int */
> +
> +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 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 = {
> + .name = "int8",
> + .get = get_int8,
> + .put = put_int8,
> +};
> +
> +/* 16 bit int */
> +
> +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 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 = {
> + .name = "int16",
> + .get = get_int16,
> + .put = put_int16,
> +};
> +
> +/* 32 bit int */
> +
> +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 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 = {
> + .name = "int32",
> + .get = get_int32,
> + .put = put_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,
> + VMStateField *field)
> +{
> + int32_t *v = pv;
> + int32_t v2;
> + qemu_get_sbe32s(f, &v2);
> +
> + if (*v == v2) {
> + return 0;
> + }
> + error_report("%" PRIx32 " != %" PRIx32, *v, v2);
> + return -EINVAL;
> +}
> +
> +const VMStateInfo vmstate_info_int32_equal = {
> + .name = "int32 equal",
> + .get = get_int32_equal,
> + .put = put_int32,
> +};
> +
> +/* 32 bit int. Check that the received value is non-negative
> + * and less than or equal to the one in the field.
> + */
> +
> +static int get_int32_le(QEMUFile *f, void *pv, size_t size, VMStateField
> *field)
> +{
> + int32_t *cur = pv;
> + int32_t loaded;
> + qemu_get_sbe32s(f, &loaded);
> +
> + if (loaded >= 0 && loaded <= *cur) {
> + *cur = loaded;
> + return 0;
> + }
> + error_report("Invalid value %" PRId32
> + " expecting positive value <= %" PRId32,
> + loaded, *cur);
> + return -EINVAL;
> +}
> +
> +const VMStateInfo vmstate_info_int32_le = {
> + .name = "int32 le",
> + .get = get_int32_le,
> + .put = put_int32,
> +};
> +
> +/* 64 bit int */
> +
> +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 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 = {
> + .name = "int64",
> + .get = get_int64,
> + .put = put_int64,
> +};
> +
> +/* 8 bit unsigned int */
> +
> +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 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 = {
> + .name = "uint8",
> + .get = get_uint8,
> + .put = put_uint8,
> +};
> +
> +/* 16 bit unsigned int */
> +
> +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 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 = {
> + .name = "uint16",
> + .get = get_uint16,
> + .put = put_uint16,
> +};
> +
> +/* 32 bit unsigned int */
> +
> +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 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 = {
> + .name = "uint32",
> + .get = get_uint32,
> + .put = put_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,
> + VMStateField *field)
> +{
> + uint32_t *v = pv;
> + uint32_t v2;
> + qemu_get_be32s(f, &v2);
> +
> + if (*v == v2) {
> + return 0;
> + }
> + error_report("%" PRIx32 " != %" PRIx32, *v, v2);
> + return -EINVAL;
> +}
> +
> +const VMStateInfo vmstate_info_uint32_equal = {
> + .name = "uint32 equal",
> + .get = get_uint32_equal,
> + .put = put_uint32,
> +};
> +
> +/* 64 bit unsigned int */
> +
> +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 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 = {
> + .name = "uint64",
> + .get = get_uint64,
> + .put = put_uint64,
> +};
> +
> +static int get_nullptr(QEMUFile *f, void *pv, size_t size, VMStateField
> *field)
> +
> +{
> + if (qemu_get_byte(f) == VMS_NULLPTR_MARKER) {
> + return 0;
> + }
> + error_report("vmstate: get_nullptr expected VMS_NULLPTR_MARKER");
> + return -EINVAL;
> +}
> +
> +static int put_nullptr(QEMUFile *f, void *pv, size_t size,
> + VMStateField *field, QJSON *vmdesc)
> +
> +{
> + if (pv == NULL) {
> + qemu_put_byte(f, VMS_NULLPTR_MARKER);
> + return 0;
> + }
> + error_report("vmstate: put_nullptr must be called with pv == NULL");
> + return -EINVAL;
> +}
> +
> +const VMStateInfo vmstate_info_nullptr = {
> + .name = "uint64",
> + .get = get_nullptr,
> + .put = put_nullptr,
> +};
> +
> +/* 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,
> + VMStateField *field)
> +{
> + uint64_t *v = pv;
> + uint64_t v2;
> + qemu_get_be64s(f, &v2);
> +
> + if (*v == v2) {
> + return 0;
> + }
> + error_report("%" PRIx64 " != %" PRIx64, *v, v2);
> + return -EINVAL;
> +}
> +
> +const VMStateInfo vmstate_info_uint64_equal = {
> + .name = "int64 equal",
> + .get = get_uint64_equal,
> + .put = put_uint64,
> +};
> +
> +/* 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,
> + VMStateField *field)
> +{
> + uint8_t *v = pv;
> + uint8_t v2;
> + qemu_get_8s(f, &v2);
> +
> + if (*v == v2) {
> + return 0;
> + }
> + error_report("%x != %x", *v, v2);
> + return -EINVAL;
> +}
> +
> +const VMStateInfo vmstate_info_uint8_equal = {
> + .name = "uint8 equal",
> + .get = get_uint8_equal,
> + .put = put_uint8,
> +};
> +
> +/* 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,
> + VMStateField *field)
> +{
> + uint16_t *v = pv;
> + uint16_t v2;
> + qemu_get_be16s(f, &v2);
> +
> + if (*v == v2) {
> + return 0;
> + }
> + error_report("%x != %x", *v, v2);
> + return -EINVAL;
> +}
> +
> +const VMStateInfo vmstate_info_uint16_equal = {
> + .name = "uint16 equal",
> + .get = get_uint16_equal,
> + .put = put_uint16,
> +};
> +
> +/* floating point */
> +
> +static int get_float64(QEMUFile *f, void *pv, size_t size,
> + VMStateField *field)
> +{
> + float64 *v = pv;
> +
> + *v = make_float64(qemu_get_be64(f));
> + return 0;
> +}
> +
> +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 = {
> + .name = "float64",
> + .get = get_float64,
> + .put = put_float64,
> +};
> +
> +/* CPU_DoubleU type */
> +
> +static int get_cpudouble(QEMUFile *f, void *pv, size_t size,
> + VMStateField *field)
> +{
> + CPU_DoubleU *v = pv;
> + qemu_get_be32s(f, &v->l.upper);
> + qemu_get_be32s(f, &v->l.lower);
> + return 0;
> +}
> +
> +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 = {
> + .name = "CPU_Double_U",
> + .get = get_cpudouble,
> + .put = put_cpudouble,
> +};
> +
> +/* uint8_t buffers */
> +
> +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 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 = {
> + .name = "buffer",
> + .get = get_buffer,
> + .put = put_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,
> + VMStateField *field)
> +{
> + uint8_t buf[1024];
> + int block_len;
> +
> + while (size > 0) {
> + block_len = MIN(sizeof(buf), size);
> + size -= block_len;
> + qemu_get_buffer(f, buf, block_len);
> + }
> + return 0;
> +}
> +
> +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;
> +
> + while (size > 0) {
> + block_len = MIN(sizeof(buf), size);
> + size -= block_len;
> + qemu_put_buffer(f, buf, block_len);
> + }
> +
> + return 0;
> +}
> +
> +const VMStateInfo vmstate_info_unused_buffer = {
> + .name = "unused_buffer",
> + .get = get_unused_buffer,
> + .put = put_unused_buffer,
> +};
> +
> +/* vmstate_info_tmp, see VMSTATE_WITH_TMP, the idea is that we allocate
> + * a temporary buffer and the pre_load/pre_save methods in the child vmsd
> + * copy stuff from the parent into the child and do calculations to fill
> + * in fields that don't really exist in the parent but need to be in the
> + * stream.
> + */
> +static int get_tmp(QEMUFile *f, void *pv, size_t size, VMStateField *field)
> +{
> + int ret;
> + const VMStateDescription *vmsd = field->vmsd;
> + int version_id = field->version_id;
> + void *tmp = g_malloc(size);
> +
> + /* Writes the parent field which is at the start of the tmp */
> + *(void **)tmp = pv;
> + ret = vmstate_load_state(f, vmsd, tmp, version_id);
> + g_free(tmp);
> + return ret;
> +}
> +
> +static int put_tmp(QEMUFile *f, void *pv, size_t size, VMStateField *field,
> + QJSON *vmdesc)
> +{
> + const VMStateDescription *vmsd = field->vmsd;
> + void *tmp = g_malloc(size);
> +
> + /* Writes the parent field which is at the start of the tmp */
> + *(void **)tmp = pv;
> + vmstate_save_state(f, vmsd, tmp, vmdesc);
> + g_free(tmp);
> +
> + return 0;
> +}
> +
> +const VMStateInfo vmstate_info_tmp = {
> + .name = "tmp",
> + .get = get_tmp,
> + .put = put_tmp,
> +};
> +
> +/* bitmaps (as defined by bitmap.h). Note that size here is the size
> + * of the bitmap in bits. The on-the-wire format of a bitmap is 64
> + * bit words with the bits in big endian order. The in-memory format
> + * is an array of 'unsigned long', which may be either 32 or 64 bits.
> + */
> +/* 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, VMStateField
> *field)
> +{
> + unsigned long *bmp = pv;
> + int i, idx = 0;
> + for (i = 0; i < BITS_TO_U64S(size); i++) {
> + uint64_t w = qemu_get_be64(f);
> + bmp[idx++] = w;
> + if (sizeof(unsigned long) == 4 && idx < BITS_TO_LONGS(size)) {
> + bmp[idx++] = w >> 32;
> + }
> + }
> + return 0;
> +}
> +
> +static int put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField
> *field,
> + QJSON *vmdesc)
> +{
> + unsigned long *bmp = pv;
> + int i, idx = 0;
> + for (i = 0; i < BITS_TO_U64S(size); i++) {
> + uint64_t w = bmp[idx++];
> + if (sizeof(unsigned long) == 4 && idx < BITS_TO_LONGS(size)) {
> + w |= ((uint64_t)bmp[idx++]) << 32;
> + }
> + qemu_put_be64(f, w);
> + }
> +
> + return 0;
> +}
> +
> +const VMStateInfo vmstate_info_bitmap = {
> + .name = "bitmap",
> + .get = get_bitmap,
> + .put = put_bitmap,
> +};
> +
> +/* get for QTAILQ
> + * meta data about the QTAILQ is encoded in a VMStateField structure
> + */
> +static int get_qtailq(QEMUFile *f, void *pv, size_t unused_size,
> + VMStateField *field)
> +{
> + int ret = 0;
> + const VMStateDescription *vmsd = field->vmsd;
> + /* size of a QTAILQ element */
> + size_t size = field->size;
> + /* offset of the QTAILQ entry in a QTAILQ element */
> + size_t entry_offset = field->start;
> + int version_id = field->version_id;
> + void *elm;
> +
> + trace_get_qtailq(vmsd->name, version_id);
> + if (version_id > vmsd->version_id) {
> + error_report("%s %s", vmsd->name, "too new");
> + trace_get_qtailq_end(vmsd->name, "too new", -EINVAL);
> +
> + return -EINVAL;
> + }
> + if (version_id < vmsd->minimum_version_id) {
> + error_report("%s %s", vmsd->name, "too old");
> + trace_get_qtailq_end(vmsd->name, "too old", -EINVAL);
> + return -EINVAL;
> + }
> +
> + while (qemu_get_byte(f)) {
> + elm = g_malloc(size);
> + ret = vmstate_load_state(f, vmsd, elm, version_id);
> + if (ret) {
> + return ret;
> + }
> + QTAILQ_RAW_INSERT_TAIL(pv, elm, entry_offset);
> + }
> +
> + trace_get_qtailq_end(vmsd->name, "end", ret);
> + return ret;
> +}
> +
> +/* put for QTAILQ */
> +static int put_qtailq(QEMUFile *f, void *pv, size_t unused_size,
> + VMStateField *field, QJSON *vmdesc)
> +{
> + const VMStateDescription *vmsd = field->vmsd;
> + /* offset of the QTAILQ entry in a QTAILQ element*/
> + size_t entry_offset = field->start;
> + void *elm;
> +
> + trace_put_qtailq(vmsd->name, vmsd->version_id);
> +
> + QTAILQ_RAW_FOREACH(elm, pv, entry_offset) {
> + qemu_put_byte(f, true);
> + vmstate_save_state(f, vmsd, elm, vmdesc);
> + }
> + qemu_put_byte(f, false);
> +
> + trace_put_qtailq_end(vmsd->name, "end");
> +
> + return 0;
> +}
> +const VMStateInfo vmstate_info_qtailq = {
> + .name = "qtailq",
> + .get = get_qtailq,
> + .put = put_qtailq,
> +};
> diff --git a/migration/vmstate.c b/migration/vmstate.c
> index 66c50ee..c284769 100644
> --- a/migration/vmstate.c
> +++ b/migration/vmstate.c
> @@ -1,3 +1,30 @@
> +/*
> + * QEMU System Emulator
> + *
> + * Copyright (c) 2009-2017 Red Hat Inc
> + *
> + * Authors:
> + * Juan Quintela <quint...@redhat.com>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> copy
> + * of this software and associated documentation files (the "Software"), to
> deal
> + * in the Software without restriction, including without limitation the
> rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> #include "qemu/osdep.h"
> #include "qemu-common.h"
> #include "migration/migration.h"
> @@ -5,7 +32,6 @@
> #include "migration/vmstate.h"
> #include "qemu/bitops.h"
> #include "qemu/error-report.h"
> -#include "qemu/queue.h"
> #include "trace.h"
> #include "qjson.h"
>
> @@ -475,644 +501,3 @@ static void vmstate_subsection_save(QEMUFile *f, const
> VMStateDescription *vmsd,
> json_end_array(vmdesc);
> }
> }
> -
> -/* bool */
> -
> -static int get_bool(QEMUFile *f, void *pv, size_t size, VMStateField *field)
> -{
> - bool *v = pv;
> - *v = qemu_get_byte(f);
> - return 0;
> -}
> -
> -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 = {
> - .name = "bool",
> - .get = get_bool,
> - .put = put_bool,
> -};
> -
> -/* 8 bit int */
> -
> -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 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 = {
> - .name = "int8",
> - .get = get_int8,
> - .put = put_int8,
> -};
> -
> -/* 16 bit int */
> -
> -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 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 = {
> - .name = "int16",
> - .get = get_int16,
> - .put = put_int16,
> -};
> -
> -/* 32 bit int */
> -
> -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 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 = {
> - .name = "int32",
> - .get = get_int32,
> - .put = put_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,
> - VMStateField *field)
> -{
> - int32_t *v = pv;
> - int32_t v2;
> - qemu_get_sbe32s(f, &v2);
> -
> - if (*v == v2) {
> - return 0;
> - }
> - error_report("%" PRIx32 " != %" PRIx32, *v, v2);
> - return -EINVAL;
> -}
> -
> -const VMStateInfo vmstate_info_int32_equal = {
> - .name = "int32 equal",
> - .get = get_int32_equal,
> - .put = put_int32,
> -};
> -
> -/* 32 bit int. Check that the received value is non-negative
> - * and less than or equal to the one in the field.
> - */
> -
> -static int get_int32_le(QEMUFile *f, void *pv, size_t size, VMStateField
> *field)
> -{
> - int32_t *cur = pv;
> - int32_t loaded;
> - qemu_get_sbe32s(f, &loaded);
> -
> - if (loaded >= 0 && loaded <= *cur) {
> - *cur = loaded;
> - return 0;
> - }
> - error_report("Invalid value %" PRId32
> - " expecting positive value <= %" PRId32,
> - loaded, *cur);
> - return -EINVAL;
> -}
> -
> -const VMStateInfo vmstate_info_int32_le = {
> - .name = "int32 le",
> - .get = get_int32_le,
> - .put = put_int32,
> -};
> -
> -/* 64 bit int */
> -
> -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 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 = {
> - .name = "int64",
> - .get = get_int64,
> - .put = put_int64,
> -};
> -
> -/* 8 bit unsigned int */
> -
> -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 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 = {
> - .name = "uint8",
> - .get = get_uint8,
> - .put = put_uint8,
> -};
> -
> -/* 16 bit unsigned int */
> -
> -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 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 = {
> - .name = "uint16",
> - .get = get_uint16,
> - .put = put_uint16,
> -};
> -
> -/* 32 bit unsigned int */
> -
> -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 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 = {
> - .name = "uint32",
> - .get = get_uint32,
> - .put = put_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,
> - VMStateField *field)
> -{
> - uint32_t *v = pv;
> - uint32_t v2;
> - qemu_get_be32s(f, &v2);
> -
> - if (*v == v2) {
> - return 0;
> - }
> - error_report("%" PRIx32 " != %" PRIx32, *v, v2);
> - return -EINVAL;
> -}
> -
> -const VMStateInfo vmstate_info_uint32_equal = {
> - .name = "uint32 equal",
> - .get = get_uint32_equal,
> - .put = put_uint32,
> -};
> -
> -/* 64 bit unsigned int */
> -
> -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 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 = {
> - .name = "uint64",
> - .get = get_uint64,
> - .put = put_uint64,
> -};
> -
> -static int get_nullptr(QEMUFile *f, void *pv, size_t size, VMStateField
> *field)
> -
> -{
> - if (qemu_get_byte(f) == VMS_NULLPTR_MARKER) {
> - return 0;
> - }
> - error_report("vmstate: get_nullptr expected VMS_NULLPTR_MARKER");
> - return -EINVAL;
> -}
> -
> -static int put_nullptr(QEMUFile *f, void *pv, size_t size,
> - VMStateField *field, QJSON *vmdesc)
> -
> -{
> - if (pv == NULL) {
> - qemu_put_byte(f, VMS_NULLPTR_MARKER);
> - return 0;
> - }
> - error_report("vmstate: put_nullptr must be called with pv == NULL");
> - return -EINVAL;
> -}
> -
> -const VMStateInfo vmstate_info_nullptr = {
> - .name = "uint64",
> - .get = get_nullptr,
> - .put = put_nullptr,
> -};
> -
> -/* 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,
> - VMStateField *field)
> -{
> - uint64_t *v = pv;
> - uint64_t v2;
> - qemu_get_be64s(f, &v2);
> -
> - if (*v == v2) {
> - return 0;
> - }
> - error_report("%" PRIx64 " != %" PRIx64, *v, v2);
> - return -EINVAL;
> -}
> -
> -const VMStateInfo vmstate_info_uint64_equal = {
> - .name = "int64 equal",
> - .get = get_uint64_equal,
> - .put = put_uint64,
> -};
> -
> -/* 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,
> - VMStateField *field)
> -{
> - uint8_t *v = pv;
> - uint8_t v2;
> - qemu_get_8s(f, &v2);
> -
> - if (*v == v2) {
> - return 0;
> - }
> - error_report("%x != %x", *v, v2);
> - return -EINVAL;
> -}
> -
> -const VMStateInfo vmstate_info_uint8_equal = {
> - .name = "uint8 equal",
> - .get = get_uint8_equal,
> - .put = put_uint8,
> -};
> -
> -/* 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,
> - VMStateField *field)
> -{
> - uint16_t *v = pv;
> - uint16_t v2;
> - qemu_get_be16s(f, &v2);
> -
> - if (*v == v2) {
> - return 0;
> - }
> - error_report("%x != %x", *v, v2);
> - return -EINVAL;
> -}
> -
> -const VMStateInfo vmstate_info_uint16_equal = {
> - .name = "uint16 equal",
> - .get = get_uint16_equal,
> - .put = put_uint16,
> -};
> -
> -/* floating point */
> -
> -static int get_float64(QEMUFile *f, void *pv, size_t size,
> - VMStateField *field)
> -{
> - float64 *v = pv;
> -
> - *v = make_float64(qemu_get_be64(f));
> - return 0;
> -}
> -
> -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 = {
> - .name = "float64",
> - .get = get_float64,
> - .put = put_float64,
> -};
> -
> -/* CPU_DoubleU type */
> -
> -static int get_cpudouble(QEMUFile *f, void *pv, size_t size,
> - VMStateField *field)
> -{
> - CPU_DoubleU *v = pv;
> - qemu_get_be32s(f, &v->l.upper);
> - qemu_get_be32s(f, &v->l.lower);
> - return 0;
> -}
> -
> -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 = {
> - .name = "CPU_Double_U",
> - .get = get_cpudouble,
> - .put = put_cpudouble,
> -};
> -
> -/* uint8_t buffers */
> -
> -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 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 = {
> - .name = "buffer",
> - .get = get_buffer,
> - .put = put_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,
> - VMStateField *field)
> -{
> - uint8_t buf[1024];
> - int block_len;
> -
> - while (size > 0) {
> - block_len = MIN(sizeof(buf), size);
> - size -= block_len;
> - qemu_get_buffer(f, buf, block_len);
> - }
> - return 0;
> -}
> -
> -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;
> -
> - while (size > 0) {
> - block_len = MIN(sizeof(buf), size);
> - size -= block_len;
> - qemu_put_buffer(f, buf, block_len);
> - }
> -
> - return 0;
> -}
> -
> -const VMStateInfo vmstate_info_unused_buffer = {
> - .name = "unused_buffer",
> - .get = get_unused_buffer,
> - .put = put_unused_buffer,
> -};
> -
> -/* vmstate_info_tmp, see VMSTATE_WITH_TMP, the idea is that we allocate
> - * a temporary buffer and the pre_load/pre_save methods in the child vmsd
> - * copy stuff from the parent into the child and do calculations to fill
> - * in fields that don't really exist in the parent but need to be in the
> - * stream.
> - */
> -static int get_tmp(QEMUFile *f, void *pv, size_t size, VMStateField *field)
> -{
> - int ret;
> - const VMStateDescription *vmsd = field->vmsd;
> - int version_id = field->version_id;
> - void *tmp = g_malloc(size);
> -
> - /* Writes the parent field which is at the start of the tmp */
> - *(void **)tmp = pv;
> - ret = vmstate_load_state(f, vmsd, tmp, version_id);
> - g_free(tmp);
> - return ret;
> -}
> -
> -static int put_tmp(QEMUFile *f, void *pv, size_t size, VMStateField *field,
> - QJSON *vmdesc)
> -{
> - const VMStateDescription *vmsd = field->vmsd;
> - void *tmp = g_malloc(size);
> -
> - /* Writes the parent field which is at the start of the tmp */
> - *(void **)tmp = pv;
> - vmstate_save_state(f, vmsd, tmp, vmdesc);
> - g_free(tmp);
> -
> - return 0;
> -}
> -
> -const VMStateInfo vmstate_info_tmp = {
> - .name = "tmp",
> - .get = get_tmp,
> - .put = put_tmp,
> -};
> -
> -/* bitmaps (as defined by bitmap.h). Note that size here is the size
> - * of the bitmap in bits. The on-the-wire format of a bitmap is 64
> - * bit words with the bits in big endian order. The in-memory format
> - * is an array of 'unsigned long', which may be either 32 or 64 bits.
> - */
> -/* 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, VMStateField
> *field)
> -{
> - unsigned long *bmp = pv;
> - int i, idx = 0;
> - for (i = 0; i < BITS_TO_U64S(size); i++) {
> - uint64_t w = qemu_get_be64(f);
> - bmp[idx++] = w;
> - if (sizeof(unsigned long) == 4 && idx < BITS_TO_LONGS(size)) {
> - bmp[idx++] = w >> 32;
> - }
> - }
> - return 0;
> -}
> -
> -static int put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField
> *field,
> - QJSON *vmdesc)
> -{
> - unsigned long *bmp = pv;
> - int i, idx = 0;
> - for (i = 0; i < BITS_TO_U64S(size); i++) {
> - uint64_t w = bmp[idx++];
> - if (sizeof(unsigned long) == 4 && idx < BITS_TO_LONGS(size)) {
> - w |= ((uint64_t)bmp[idx++]) << 32;
> - }
> - qemu_put_be64(f, w);
> - }
> -
> - return 0;
> -}
> -
> -const VMStateInfo vmstate_info_bitmap = {
> - .name = "bitmap",
> - .get = get_bitmap,
> - .put = put_bitmap,
> -};
> -
> -/* get for QTAILQ
> - * meta data about the QTAILQ is encoded in a VMStateField structure
> - */
> -static int get_qtailq(QEMUFile *f, void *pv, size_t unused_size,
> - VMStateField *field)
> -{
> - int ret = 0;
> - const VMStateDescription *vmsd = field->vmsd;
> - /* size of a QTAILQ element */
> - size_t size = field->size;
> - /* offset of the QTAILQ entry in a QTAILQ element */
> - size_t entry_offset = field->start;
> - int version_id = field->version_id;
> - void *elm;
> -
> - trace_get_qtailq(vmsd->name, version_id);
> - if (version_id > vmsd->version_id) {
> - error_report("%s %s", vmsd->name, "too new");
> - trace_get_qtailq_end(vmsd->name, "too new", -EINVAL);
> -
> - return -EINVAL;
> - }
> - if (version_id < vmsd->minimum_version_id) {
> - error_report("%s %s", vmsd->name, "too old");
> - trace_get_qtailq_end(vmsd->name, "too old", -EINVAL);
> - return -EINVAL;
> - }
> -
> - while (qemu_get_byte(f)) {
> - elm = g_malloc(size);
> - ret = vmstate_load_state(f, vmsd, elm, version_id);
> - if (ret) {
> - return ret;
> - }
> - QTAILQ_RAW_INSERT_TAIL(pv, elm, entry_offset);
> - }
> -
> - trace_get_qtailq_end(vmsd->name, "end", ret);
> - return ret;
> -}
> -
> -/* put for QTAILQ */
> -static int put_qtailq(QEMUFile *f, void *pv, size_t unused_size,
> - VMStateField *field, QJSON *vmdesc)
> -{
> - const VMStateDescription *vmsd = field->vmsd;
> - /* offset of the QTAILQ entry in a QTAILQ element*/
> - size_t entry_offset = field->start;
> - void *elm;
> -
> - trace_put_qtailq(vmsd->name, vmsd->version_id);
> -
> - QTAILQ_RAW_FOREACH(elm, pv, entry_offset) {
> - qemu_put_byte(f, true);
> - vmstate_save_state(f, vmsd, elm, vmdesc);
> - }
> - qemu_put_byte(f, false);
> -
> - trace_put_qtailq_end(vmsd->name, "end");
> -
> - return 0;
> -}
> -const VMStateInfo vmstate_info_qtailq = {
> - .name = "qtailq",
> - .get = get_qtailq,
> - .put = put_qtailq,
> -};
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index abdea89..f1f03b5 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -570,7 +570,7 @@ tests/test-qdev-global-props$(EXESUF):
> tests/test-qdev-global-props.o \
> hw/core/reset.o \
> $(test-qapi-obj-y)
> tests/test-vmstate$(EXESUF): tests/test-vmstate.o \
> - migration/vmstate.o migration/qemu-file.o \
> + migration/vmstate.o migration/vmstate-types.o migration/qemu-file.o \
> migration/qemu-file-channel.o migration/qjson.o \
> $(test-io-obj-y)
> tests/test-timed-average$(EXESUF): tests/test-timed-average.o
> $(test-util-obj-y)
> --
> 2.9.3
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
