From patchwork Tue Oct 9 04:53:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 190205 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 0A6AA2C00A7 for ; Tue, 9 Oct 2012 16:23:12 +1100 (EST) Received: from localhost ([::1]:48756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLRoV-0003lB-G0 for incoming@patchwork.ozlabs.org; Tue, 09 Oct 2012 00:53:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLRo5-0002wD-Vs for qemu-devel@nongnu.org; Tue, 09 Oct 2012 00:52:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLRo3-0003jz-CH for qemu-devel@nongnu.org; Tue, 09 Oct 2012 00:52:37 -0400 Received: from ozlabs.org ([203.10.76.45]:50033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLRo3-0003jP-0E for qemu-devel@nongnu.org; Tue, 09 Oct 2012 00:52:35 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id D99DE2C00DA; Tue, 9 Oct 2012 15:52:32 +1100 (EST) From: David Gibson To: aliguori@us.ibm.com, quintela@redhat.com Date: Tue, 9 Oct 2012 15:53:26 +1100 Message-Id: <1349758412-5559-2-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349758412-5559-1-git-send-email-david@gibson.dropbear.id.au> References: <1349758412-5559-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: blauwirbel@gmail.com, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 1/7] 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 --- savevm.c | 21 +++++++++++++++++++++ vmstate.h | 7 +++++++ 2 files changed, 28 insertions(+) diff --git a/savevm.c b/savevm.c index 31fd2e0..fcbc706 100644 --- a/savevm.c +++ b/savevm.c @@ -1043,6 +1043,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 */ diff --git a/vmstate.h b/vmstate.h index c9c320e..6c7fbe0 100644 --- a/vmstate.h +++ b/vmstate.h @@ -129,6 +129,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; @@ -488,6 +489,12 @@ extern const VMStateInfo vmstate_info_unused_buffer; #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)