From nobody Mon Feb 9 18:18:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14931585389281019.2666688473855; Tue, 25 Apr 2017 15:15:38 -0700 (PDT) Received: from localhost ([::1]:51585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d38kC-0007LJ-Dp for importer@patchew.org; Tue, 25 Apr 2017 18:15:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d38aI-00076h-SM for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:05:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d38aF-00059F-29 for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:05:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36206) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d38aE-000589-Ks for qemu-devel@nongnu.org; Tue, 25 Apr 2017 18:05:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A010580044 for ; Tue, 25 Apr 2017 22:05:17 +0000 (UTC) Received: from secure.mitica (unknown [10.36.118.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 223101714C; Tue, 25 Apr 2017 22:05:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A010580044 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A010580044 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 26 Apr 2017 00:04:21 +0200 Message-Id: <20170425220451.6028-12-quintela@redhat.com> In-Reply-To: <20170425220451.6028-1-quintela@redhat.com> References: <20170425220451.6028-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 25 Apr 2017 22:05:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 11/41] migration: Split vmstate-types.c from vmstate.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now one just has the interperter, and the other has the basic types. Once there, add copyright boilerplate. Signed-off-by: Juan Quintela --- 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 +=3D migration.o socket.o fd.o exec.o common-obj-y +=3D tls.o channel.o common-obj-y +=3D colo-comm.o colo.o colo-failover.o -common-obj-y +=3D vmstate.o page_cache.o +common-obj-y +=3D vmstate.o vmstate-types.o page_cache.o common-obj-y +=3D qemu-file.o common-obj-y +=3D qemu-file-channel.o common-obj-y +=3D 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 + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * 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 OT= HER + * 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 *fiel= d) +{ + bool *v =3D pv; + *v =3D qemu_get_byte(f); + return 0; +} + +static int put_bool(QEMUFile *f, void *pv, size_t size, VMStateField *fiel= d, + QJSON *vmdesc) +{ + bool *v =3D pv; + qemu_put_byte(f, *v); + return 0; +} + +const VMStateInfo vmstate_info_bool =3D { + .name =3D "bool", + .get =3D get_bool, + .put =3D put_bool, +}; + +/* 8 bit int */ + +static int get_int8(QEMUFile *f, void *pv, size_t size, VMStateField *fiel= d) +{ + int8_t *v =3D pv; + qemu_get_s8s(f, v); + return 0; +} + +static int put_int8(QEMUFile *f, void *pv, size_t size, VMStateField *fiel= d, + QJSON *vmdesc) +{ + int8_t *v =3D pv; + qemu_put_s8s(f, v); + return 0; +} + +const VMStateInfo vmstate_info_int8 =3D { + .name =3D "int8", + .get =3D get_int8, + .put =3D put_int8, +}; + +/* 16 bit int */ + +static int get_int16(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld) +{ + int16_t *v =3D pv; + qemu_get_sbe16s(f, v); + return 0; +} + +static int put_int16(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld, + QJSON *vmdesc) +{ + int16_t *v =3D pv; + qemu_put_sbe16s(f, v); + return 0; +} + +const VMStateInfo vmstate_info_int16 =3D { + .name =3D "int16", + .get =3D get_int16, + .put =3D put_int16, +}; + +/* 32 bit int */ + +static int get_int32(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld) +{ + int32_t *v =3D pv; + qemu_get_sbe32s(f, v); + return 0; +} + +static int put_int32(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld, + QJSON *vmdesc) +{ + int32_t *v =3D pv; + qemu_put_sbe32s(f, v); + return 0; +} + +const VMStateInfo vmstate_info_int32 =3D { + .name =3D "int32", + .get =3D get_int32, + .put =3D 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 =3D pv; + int32_t v2; + qemu_get_sbe32s(f, &v2); + + if (*v =3D=3D v2) { + return 0; + } + error_report("%" PRIx32 " !=3D %" PRIx32, *v, v2); + return -EINVAL; +} + +const VMStateInfo vmstate_info_int32_equal =3D { + .name =3D "int32 equal", + .get =3D get_int32_equal, + .put =3D 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 =3D pv; + int32_t loaded; + qemu_get_sbe32s(f, &loaded); + + if (loaded >=3D 0 && loaded <=3D *cur) { + *cur =3D loaded; + return 0; + } + error_report("Invalid value %" PRId32 + " expecting positive value <=3D %" PRId32, + loaded, *cur); + return -EINVAL; +} + +const VMStateInfo vmstate_info_int32_le =3D { + .name =3D "int32 le", + .get =3D get_int32_le, + .put =3D put_int32, +}; + +/* 64 bit int */ + +static int get_int64(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld) +{ + int64_t *v =3D pv; + qemu_get_sbe64s(f, v); + return 0; +} + +static int put_int64(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld, + QJSON *vmdesc) +{ + int64_t *v =3D pv; + qemu_put_sbe64s(f, v); + return 0; +} + +const VMStateInfo vmstate_info_int64 =3D { + .name =3D "int64", + .get =3D get_int64, + .put =3D put_int64, +}; + +/* 8 bit unsigned int */ + +static int get_uint8(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld) +{ + uint8_t *v =3D pv; + qemu_get_8s(f, v); + return 0; +} + +static int put_uint8(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld, + QJSON *vmdesc) +{ + uint8_t *v =3D pv; + qemu_put_8s(f, v); + return 0; +} + +const VMStateInfo vmstate_info_uint8 =3D { + .name =3D "uint8", + .get =3D get_uint8, + .put =3D put_uint8, +}; + +/* 16 bit unsigned int */ + +static int get_uint16(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld) +{ + uint16_t *v =3D pv; + qemu_get_be16s(f, v); + return 0; +} + +static int put_uint16(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, + QJSON *vmdesc) +{ + uint16_t *v =3D pv; + qemu_put_be16s(f, v); + return 0; +} + +const VMStateInfo vmstate_info_uint16 =3D { + .name =3D "uint16", + .get =3D get_uint16, + .put =3D put_uint16, +}; + +/* 32 bit unsigned int */ + +static int get_uint32(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld) +{ + uint32_t *v =3D pv; + qemu_get_be32s(f, v); + return 0; +} + +static int put_uint32(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, + QJSON *vmdesc) +{ + uint32_t *v =3D pv; + qemu_put_be32s(f, v); + return 0; +} + +const VMStateInfo vmstate_info_uint32 =3D { + .name =3D "uint32", + .get =3D get_uint32, + .put =3D 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 =3D pv; + uint32_t v2; + qemu_get_be32s(f, &v2); + + if (*v =3D=3D v2) { + return 0; + } + error_report("%" PRIx32 " !=3D %" PRIx32, *v, v2); + return -EINVAL; +} + +const VMStateInfo vmstate_info_uint32_equal =3D { + .name =3D "uint32 equal", + .get =3D get_uint32_equal, + .put =3D put_uint32, +}; + +/* 64 bit unsigned int */ + +static int get_uint64(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld) +{ + uint64_t *v =3D pv; + qemu_get_be64s(f, v); + return 0; +} + +static int put_uint64(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, + QJSON *vmdesc) +{ + uint64_t *v =3D pv; + qemu_put_be64s(f, v); + return 0; +} + +const VMStateInfo vmstate_info_uint64 =3D { + .name =3D "uint64", + .get =3D get_uint64, + .put =3D put_uint64, +}; + +static int get_nullptr(QEMUFile *f, void *pv, size_t size, VMStateField *f= ield) + +{ + if (qemu_get_byte(f) =3D=3D 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 =3D=3D NULL) { + qemu_put_byte(f, VMS_NULLPTR_MARKER); + return 0; + } + error_report("vmstate: put_nullptr must be called with pv =3D=3D NULL"= ); + return -EINVAL; +} + +const VMStateInfo vmstate_info_nullptr =3D { + .name =3D "uint64", + .get =3D get_nullptr, + .put =3D put_nullptr, +}; + +/* 64 bit unsigned int. See that the received value is the same than the o= ne + in the field */ + +static int get_uint64_equal(QEMUFile *f, void *pv, size_t size, + VMStateField *field) +{ + uint64_t *v =3D pv; + uint64_t v2; + qemu_get_be64s(f, &v2); + + if (*v =3D=3D v2) { + return 0; + } + error_report("%" PRIx64 " !=3D %" PRIx64, *v, v2); + return -EINVAL; +} + +const VMStateInfo vmstate_info_uint64_equal =3D { + .name =3D "int64 equal", + .get =3D get_uint64_equal, + .put =3D 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 =3D pv; + uint8_t v2; + qemu_get_8s(f, &v2); + + if (*v =3D=3D v2) { + return 0; + } + error_report("%x !=3D %x", *v, v2); + return -EINVAL; +} + +const VMStateInfo vmstate_info_uint8_equal =3D { + .name =3D "uint8 equal", + .get =3D get_uint8_equal, + .put =3D put_uint8, +}; + +/* 16 bit unsigned int int. See that the received value is the same than t= he one + in the field */ + +static int get_uint16_equal(QEMUFile *f, void *pv, size_t size, + VMStateField *field) +{ + uint16_t *v =3D pv; + uint16_t v2; + qemu_get_be16s(f, &v2); + + if (*v =3D=3D v2) { + return 0; + } + error_report("%x !=3D %x", *v, v2); + return -EINVAL; +} + +const VMStateInfo vmstate_info_uint16_equal =3D { + .name =3D "uint16 equal", + .get =3D get_uint16_equal, + .put =3D put_uint16, +}; + +/* floating point */ + +static int get_float64(QEMUFile *f, void *pv, size_t size, + VMStateField *field) +{ + float64 *v =3D pv; + + *v =3D make_float64(qemu_get_be64(f)); + return 0; +} + +static int put_float64(QEMUFile *f, void *pv, size_t size, VMStateField *f= ield, + QJSON *vmdesc) +{ + uint64_t *v =3D pv; + + qemu_put_be64(f, float64_val(*v)); + return 0; +} + +const VMStateInfo vmstate_info_float64 =3D { + .name =3D "float64", + .get =3D get_float64, + .put =3D put_float64, +}; + +/* CPU_DoubleU type */ + +static int get_cpudouble(QEMUFile *f, void *pv, size_t size, + VMStateField *field) +{ + CPU_DoubleU *v =3D 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 =3D pv; + qemu_put_be32s(f, &v->l.upper); + qemu_put_be32s(f, &v->l.lower); + return 0; +} + +const VMStateInfo vmstate_info_cpudouble =3D { + .name =3D "CPU_Double_U", + .get =3D get_cpudouble, + .put =3D put_cpudouble, +}; + +/* uint8_t buffers */ + +static int get_buffer(QEMUFile *f, void *pv, size_t size, + VMStateField *field) +{ + uint8_t *v =3D pv; + qemu_get_buffer(f, v, size); + return 0; +} + +static int put_buffer(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, + QJSON *vmdesc) +{ + uint8_t *v =3D pv; + qemu_put_buffer(f, v, size); + return 0; +} + +const VMStateInfo vmstate_info_buffer =3D { + .name =3D "buffer", + .get =3D get_buffer, + .put =3D 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 =3D MIN(sizeof(buf), size); + size -=3D 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 =3D MIN(sizeof(buf), size); + size -=3D block_len; + qemu_put_buffer(f, buf, block_len); + } + + return 0; +} + +const VMStateInfo vmstate_info_unused_buffer =3D { + .name =3D "unused_buffer", + .get =3D get_unused_buffer, + .put =3D 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 =3D field->vmsd; + int version_id =3D field->version_id; + void *tmp =3D g_malloc(size); + + /* Writes the parent field which is at the start of the tmp */ + *(void **)tmp =3D pv; + ret =3D 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 =3D field->vmsd; + void *tmp =3D g_malloc(size); + + /* Writes the parent field which is at the start of the tmp */ + *(void **)tmp =3D pv; + vmstate_save_state(f, vmsd, tmp, vmdesc); + g_free(tmp); + + return 0; +} + +const VMStateInfo vmstate_info_tmp =3D { + .name =3D "tmp", + .get =3D get_tmp, + .put =3D 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 *fi= eld) +{ + unsigned long *bmp =3D pv; + int i, idx =3D 0; + for (i =3D 0; i < BITS_TO_U64S(size); i++) { + uint64_t w =3D qemu_get_be64(f); + bmp[idx++] =3D w; + if (sizeof(unsigned long) =3D=3D 4 && idx < BITS_TO_LONGS(size)) { + bmp[idx++] =3D w >> 32; + } + } + return 0; +} + +static int put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, + QJSON *vmdesc) +{ + unsigned long *bmp =3D pv; + int i, idx =3D 0; + for (i =3D 0; i < BITS_TO_U64S(size); i++) { + uint64_t w =3D bmp[idx++]; + if (sizeof(unsigned long) =3D=3D 4 && idx < BITS_TO_LONGS(size)) { + w |=3D ((uint64_t)bmp[idx++]) << 32; + } + qemu_put_be64(f, w); + } + + return 0; +} + +const VMStateInfo vmstate_info_bitmap =3D { + .name =3D "bitmap", + .get =3D get_bitmap, + .put =3D 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 =3D 0; + const VMStateDescription *vmsd =3D field->vmsd; + /* size of a QTAILQ element */ + size_t size =3D field->size; + /* offset of the QTAILQ entry in a QTAILQ element */ + size_t entry_offset =3D field->start; + int version_id =3D 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 =3D g_malloc(size); + ret =3D 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 =3D field->vmsd; + /* offset of the QTAILQ entry in a QTAILQ element*/ + size_t entry_offset =3D 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 =3D { + .name =3D "qtailq", + .get =3D get_qtailq, + .put =3D 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 + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * 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 OT= HER + * 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" =20 @@ -475,644 +501,3 @@ static void vmstate_subsection_save(QEMUFile *f, cons= t VMStateDescription *vmsd, json_end_array(vmdesc); } } - -/* bool */ - -static int get_bool(QEMUFile *f, void *pv, size_t size, VMStateField *fiel= d) -{ - bool *v =3D pv; - *v =3D qemu_get_byte(f); - return 0; -} - -static int put_bool(QEMUFile *f, void *pv, size_t size, VMStateField *fiel= d, - QJSON *vmdesc) -{ - bool *v =3D pv; - qemu_put_byte(f, *v); - return 0; -} - -const VMStateInfo vmstate_info_bool =3D { - .name =3D "bool", - .get =3D get_bool, - .put =3D put_bool, -}; - -/* 8 bit int */ - -static int get_int8(QEMUFile *f, void *pv, size_t size, VMStateField *fiel= d) -{ - int8_t *v =3D pv; - qemu_get_s8s(f, v); - return 0; -} - -static int put_int8(QEMUFile *f, void *pv, size_t size, VMStateField *fiel= d, - QJSON *vmdesc) -{ - int8_t *v =3D pv; - qemu_put_s8s(f, v); - return 0; -} - -const VMStateInfo vmstate_info_int8 =3D { - .name =3D "int8", - .get =3D get_int8, - .put =3D put_int8, -}; - -/* 16 bit int */ - -static int get_int16(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld) -{ - int16_t *v =3D pv; - qemu_get_sbe16s(f, v); - return 0; -} - -static int put_int16(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld, - QJSON *vmdesc) -{ - int16_t *v =3D pv; - qemu_put_sbe16s(f, v); - return 0; -} - -const VMStateInfo vmstate_info_int16 =3D { - .name =3D "int16", - .get =3D get_int16, - .put =3D put_int16, -}; - -/* 32 bit int */ - -static int get_int32(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld) -{ - int32_t *v =3D pv; - qemu_get_sbe32s(f, v); - return 0; -} - -static int put_int32(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld, - QJSON *vmdesc) -{ - int32_t *v =3D pv; - qemu_put_sbe32s(f, v); - return 0; -} - -const VMStateInfo vmstate_info_int32 =3D { - .name =3D "int32", - .get =3D get_int32, - .put =3D 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 =3D pv; - int32_t v2; - qemu_get_sbe32s(f, &v2); - - if (*v =3D=3D v2) { - return 0; - } - error_report("%" PRIx32 " !=3D %" PRIx32, *v, v2); - return -EINVAL; -} - -const VMStateInfo vmstate_info_int32_equal =3D { - .name =3D "int32 equal", - .get =3D get_int32_equal, - .put =3D 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 =3D pv; - int32_t loaded; - qemu_get_sbe32s(f, &loaded); - - if (loaded >=3D 0 && loaded <=3D *cur) { - *cur =3D loaded; - return 0; - } - error_report("Invalid value %" PRId32 - " expecting positive value <=3D %" PRId32, - loaded, *cur); - return -EINVAL; -} - -const VMStateInfo vmstate_info_int32_le =3D { - .name =3D "int32 le", - .get =3D get_int32_le, - .put =3D put_int32, -}; - -/* 64 bit int */ - -static int get_int64(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld) -{ - int64_t *v =3D pv; - qemu_get_sbe64s(f, v); - return 0; -} - -static int put_int64(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld, - QJSON *vmdesc) -{ - int64_t *v =3D pv; - qemu_put_sbe64s(f, v); - return 0; -} - -const VMStateInfo vmstate_info_int64 =3D { - .name =3D "int64", - .get =3D get_int64, - .put =3D put_int64, -}; - -/* 8 bit unsigned int */ - -static int get_uint8(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld) -{ - uint8_t *v =3D pv; - qemu_get_8s(f, v); - return 0; -} - -static int put_uint8(QEMUFile *f, void *pv, size_t size, VMStateField *fie= ld, - QJSON *vmdesc) -{ - uint8_t *v =3D pv; - qemu_put_8s(f, v); - return 0; -} - -const VMStateInfo vmstate_info_uint8 =3D { - .name =3D "uint8", - .get =3D get_uint8, - .put =3D put_uint8, -}; - -/* 16 bit unsigned int */ - -static int get_uint16(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld) -{ - uint16_t *v =3D pv; - qemu_get_be16s(f, v); - return 0; -} - -static int put_uint16(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, - QJSON *vmdesc) -{ - uint16_t *v =3D pv; - qemu_put_be16s(f, v); - return 0; -} - -const VMStateInfo vmstate_info_uint16 =3D { - .name =3D "uint16", - .get =3D get_uint16, - .put =3D put_uint16, -}; - -/* 32 bit unsigned int */ - -static int get_uint32(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld) -{ - uint32_t *v =3D pv; - qemu_get_be32s(f, v); - return 0; -} - -static int put_uint32(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, - QJSON *vmdesc) -{ - uint32_t *v =3D pv; - qemu_put_be32s(f, v); - return 0; -} - -const VMStateInfo vmstate_info_uint32 =3D { - .name =3D "uint32", - .get =3D get_uint32, - .put =3D 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 =3D pv; - uint32_t v2; - qemu_get_be32s(f, &v2); - - if (*v =3D=3D v2) { - return 0; - } - error_report("%" PRIx32 " !=3D %" PRIx32, *v, v2); - return -EINVAL; -} - -const VMStateInfo vmstate_info_uint32_equal =3D { - .name =3D "uint32 equal", - .get =3D get_uint32_equal, - .put =3D put_uint32, -}; - -/* 64 bit unsigned int */ - -static int get_uint64(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld) -{ - uint64_t *v =3D pv; - qemu_get_be64s(f, v); - return 0; -} - -static int put_uint64(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, - QJSON *vmdesc) -{ - uint64_t *v =3D pv; - qemu_put_be64s(f, v); - return 0; -} - -const VMStateInfo vmstate_info_uint64 =3D { - .name =3D "uint64", - .get =3D get_uint64, - .put =3D put_uint64, -}; - -static int get_nullptr(QEMUFile *f, void *pv, size_t size, VMStateField *f= ield) - -{ - if (qemu_get_byte(f) =3D=3D 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 =3D=3D NULL) { - qemu_put_byte(f, VMS_NULLPTR_MARKER); - return 0; - } - error_report("vmstate: put_nullptr must be called with pv =3D=3D NULL"= ); - return -EINVAL; -} - -const VMStateInfo vmstate_info_nullptr =3D { - .name =3D "uint64", - .get =3D get_nullptr, - .put =3D put_nullptr, -}; - -/* 64 bit unsigned int. See that the received value is the same than the o= ne - in the field */ - -static int get_uint64_equal(QEMUFile *f, void *pv, size_t size, - VMStateField *field) -{ - uint64_t *v =3D pv; - uint64_t v2; - qemu_get_be64s(f, &v2); - - if (*v =3D=3D v2) { - return 0; - } - error_report("%" PRIx64 " !=3D %" PRIx64, *v, v2); - return -EINVAL; -} - -const VMStateInfo vmstate_info_uint64_equal =3D { - .name =3D "int64 equal", - .get =3D get_uint64_equal, - .put =3D 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 =3D pv; - uint8_t v2; - qemu_get_8s(f, &v2); - - if (*v =3D=3D v2) { - return 0; - } - error_report("%x !=3D %x", *v, v2); - return -EINVAL; -} - -const VMStateInfo vmstate_info_uint8_equal =3D { - .name =3D "uint8 equal", - .get =3D get_uint8_equal, - .put =3D put_uint8, -}; - -/* 16 bit unsigned int int. See that the received value is the same than t= he one - in the field */ - -static int get_uint16_equal(QEMUFile *f, void *pv, size_t size, - VMStateField *field) -{ - uint16_t *v =3D pv; - uint16_t v2; - qemu_get_be16s(f, &v2); - - if (*v =3D=3D v2) { - return 0; - } - error_report("%x !=3D %x", *v, v2); - return -EINVAL; -} - -const VMStateInfo vmstate_info_uint16_equal =3D { - .name =3D "uint16 equal", - .get =3D get_uint16_equal, - .put =3D put_uint16, -}; - -/* floating point */ - -static int get_float64(QEMUFile *f, void *pv, size_t size, - VMStateField *field) -{ - float64 *v =3D pv; - - *v =3D make_float64(qemu_get_be64(f)); - return 0; -} - -static int put_float64(QEMUFile *f, void *pv, size_t size, VMStateField *f= ield, - QJSON *vmdesc) -{ - uint64_t *v =3D pv; - - qemu_put_be64(f, float64_val(*v)); - return 0; -} - -const VMStateInfo vmstate_info_float64 =3D { - .name =3D "float64", - .get =3D get_float64, - .put =3D put_float64, -}; - -/* CPU_DoubleU type */ - -static int get_cpudouble(QEMUFile *f, void *pv, size_t size, - VMStateField *field) -{ - CPU_DoubleU *v =3D 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 =3D pv; - qemu_put_be32s(f, &v->l.upper); - qemu_put_be32s(f, &v->l.lower); - return 0; -} - -const VMStateInfo vmstate_info_cpudouble =3D { - .name =3D "CPU_Double_U", - .get =3D get_cpudouble, - .put =3D put_cpudouble, -}; - -/* uint8_t buffers */ - -static int get_buffer(QEMUFile *f, void *pv, size_t size, - VMStateField *field) -{ - uint8_t *v =3D pv; - qemu_get_buffer(f, v, size); - return 0; -} - -static int put_buffer(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, - QJSON *vmdesc) -{ - uint8_t *v =3D pv; - qemu_put_buffer(f, v, size); - return 0; -} - -const VMStateInfo vmstate_info_buffer =3D { - .name =3D "buffer", - .get =3D get_buffer, - .put =3D 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 =3D MIN(sizeof(buf), size); - size -=3D 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 =3D MIN(sizeof(buf), size); - size -=3D block_len; - qemu_put_buffer(f, buf, block_len); - } - - return 0; -} - -const VMStateInfo vmstate_info_unused_buffer =3D { - .name =3D "unused_buffer", - .get =3D get_unused_buffer, - .put =3D 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 =3D field->vmsd; - int version_id =3D field->version_id; - void *tmp =3D g_malloc(size); - - /* Writes the parent field which is at the start of the tmp */ - *(void **)tmp =3D pv; - ret =3D 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 =3D field->vmsd; - void *tmp =3D g_malloc(size); - - /* Writes the parent field which is at the start of the tmp */ - *(void **)tmp =3D pv; - vmstate_save_state(f, vmsd, tmp, vmdesc); - g_free(tmp); - - return 0; -} - -const VMStateInfo vmstate_info_tmp =3D { - .name =3D "tmp", - .get =3D get_tmp, - .put =3D 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 *fi= eld) -{ - unsigned long *bmp =3D pv; - int i, idx =3D 0; - for (i =3D 0; i < BITS_TO_U64S(size); i++) { - uint64_t w =3D qemu_get_be64(f); - bmp[idx++] =3D w; - if (sizeof(unsigned long) =3D=3D 4 && idx < BITS_TO_LONGS(size)) { - bmp[idx++] =3D w >> 32; - } - } - return 0; -} - -static int put_bitmap(QEMUFile *f, void *pv, size_t size, VMStateField *fi= eld, - QJSON *vmdesc) -{ - unsigned long *bmp =3D pv; - int i, idx =3D 0; - for (i =3D 0; i < BITS_TO_U64S(size); i++) { - uint64_t w =3D bmp[idx++]; - if (sizeof(unsigned long) =3D=3D 4 && idx < BITS_TO_LONGS(size)) { - w |=3D ((uint64_t)bmp[idx++]) << 32; - } - qemu_put_be64(f, w); - } - - return 0; -} - -const VMStateInfo vmstate_info_bitmap =3D { - .name =3D "bitmap", - .get =3D get_bitmap, - .put =3D 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 =3D 0; - const VMStateDescription *vmsd =3D field->vmsd; - /* size of a QTAILQ element */ - size_t size =3D field->size; - /* offset of the QTAILQ entry in a QTAILQ element */ - size_t entry_offset =3D field->start; - int version_id =3D 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 =3D g_malloc(size); - ret =3D 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 =3D field->vmsd; - /* offset of the QTAILQ entry in a QTAILQ element*/ - size_t entry_offset =3D 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 =3D { - .name =3D "qtailq", - .get =3D get_qtailq, - .put =3D put_qtailq, -}; diff --git a/tests/Makefile.include b/tests/Makefile.include index 0f98c04..7eaf586 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -569,7 +569,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) --=20 2.9.3