From patchwork Tue Mar 12 03:06:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 226750 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CD8362C02A2 for ; Tue, 12 Mar 2013 14:08:19 +1100 (EST) Received: from localhost ([::1]:48575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFFZZ-0007Vs-TP for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2013 23:08:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFFXi-0004ci-93 for qemu-devel@nongnu.org; Mon, 11 Mar 2013 23:06:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFFXY-0000S8-3I for qemu-devel@nongnu.org; Mon, 11 Mar 2013 23:06:22 -0400 Received: from ozlabs.org ([2402:b800:7003:1:1::1]:46313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFFXX-0000RS-MP for qemu-devel@nongnu.org; Mon, 11 Mar 2013 23:06:11 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 5A6FA2C02AA; Tue, 12 Mar 2013 14:06:09 +1100 (EST) From: David Gibson To: aliguori@us.ibm.com, quintela@redhat.com Date: Tue, 12 Mar 2013 14:06:00 +1100 Message-Id: <1363057565-23671-2-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363057565-23671-1-git-send-email-david@gibson.dropbear.id.au> References: <1363057565-23671-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2402:b800:7003:1:1::1 Cc: David Gibson , qemu-devel@nongnu.org, agraf@suse.de Subject: [Qemu-devel] [PATCH 1/6] savevm: Add VMSTATE_UINT64_EQUAL helpers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The savevm code already includes a number of *_EQUAL helpers which act as sanity checks verifying that the configuration of the saved state matches that of the machine we're loading into to work. Variants already exist for 8 bit 16 bit and 32 bit integers, but not 64 bit integers. This patch fills that hole, adding a UINT64 version. Signed-off-by: David Gibson --- v2: Added missing braces --- include/migration/vmstate.h | 7 +++++++ savevm.c | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index a64db94..cdb6af7 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -145,6 +145,7 @@ extern const VMStateInfo vmstate_info_uint8_equal; extern const VMStateInfo vmstate_info_uint16_equal; extern const VMStateInfo vmstate_info_int32_equal; extern const VMStateInfo vmstate_info_uint32_equal; +extern const VMStateInfo vmstate_info_uint64_equal; extern const VMStateInfo vmstate_info_int32_le; extern const VMStateInfo vmstate_info_uint8; @@ -517,6 +518,12 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_UINT32_EQUAL(_f, _s) \ VMSTATE_SINGLE(_f, _s, 0, vmstate_info_uint32_equal, uint32_t) +#define VMSTATE_UINT64_EQUAL_V(_f, _s, _v) \ + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64_equal, uint64_t) + +#define VMSTATE_UINT64_EQUAL(_f, _s) \ + VMSTATE_UINT64_EQUAL_V(_f, _s, 0) + #define VMSTATE_INT32_LE(_f, _s) \ VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_t) diff --git a/savevm.c b/savevm.c index 147e2d2..5dc678e 100644 --- a/savevm.c +++ b/savevm.c @@ -1072,6 +1072,27 @@ const VMStateInfo vmstate_info_uint64 = { .put = put_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) +{ + uint64_t *v = pv; + uint64_t v2; + qemu_get_be64s(f, &v2); + + if (*v == v2) { + return 0; + } + 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 */