From patchwork Tue Oct 9 04:53:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 190201 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 8887D2C00DA for ; Tue, 9 Oct 2012 15:52:53 +1100 (EST) Received: from localhost ([::1]:47255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLRoF-0002wZ-Hd for incoming@patchwork.ozlabs.org; Tue, 09 Oct 2012 00:52:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLRo4-0002v3-BV 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-0003jl-BW for qemu-devel@nongnu.org; Tue, 09 Oct 2012 00:52:36 -0400 Received: from ozlabs.org ([203.10.76.45]:46788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLRo3-0003jN-0A for qemu-devel@nongnu.org; Tue, 09 Oct 2012 00:52:35 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 0665B2C00F8; 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:28 +1100 Message-Id: <1349758412-5559-4-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 3/7] savevm: Add VMSTATE_FLOAT64 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 current savevm code includes VMSTATE helpers for a number of commonly used data types, but not for the float64 type used by the internal floating point emulation code. This patch fixes the deficiency. Signed-off-by: David Gibson --- savevm.c | 23 +++++++++++++++++++++++ vmstate.h | 15 +++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/savevm.c b/savevm.c index fcbc706..02e9da0 100644 --- a/savevm.c +++ b/savevm.c @@ -1104,6 +1104,29 @@ const VMStateInfo vmstate_info_uint16_equal = { .put = put_uint16, }; +/* floating point */ + +static int get_float64(QEMUFile *f, void *pv, size_t size) +{ + float64 *v = pv; + + *v = make_float64(qemu_get_be64(f)); + return 0; +} + +static void put_float64(QEMUFile *f, void *pv, size_t size) +{ + uint64_t *v = pv; + + qemu_put_be64(f, float64_val(*v)); +} + +const VMStateInfo vmstate_info_float64 = { + .name = "float64", + .get = get_float64, + .put = put_float64, +}; + /* timers */ static int get_timer(QEMUFile *f, void *pv, size_t size) diff --git a/vmstate.h b/vmstate.h index 5d1c4f5..a04561e 100644 --- a/vmstate.h +++ b/vmstate.h @@ -137,6 +137,8 @@ extern const VMStateInfo vmstate_info_uint16; extern const VMStateInfo vmstate_info_uint32; extern const VMStateInfo vmstate_info_uint64; +extern const VMStateInfo vmstate_info_float64; + extern const VMStateInfo vmstate_info_timer; extern const VMStateInfo vmstate_info_buffer; extern const VMStateInfo vmstate_info_unused_buffer; @@ -510,6 +512,13 @@ extern const VMStateInfo vmstate_info_unused_buffer; #define VMSTATE_UINT32_TEST(_f, _s, _t) \ VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint32, uint32_t) + +#define VMSTATE_FLOAT64_V(_f, _s, _v) \ + VMSTATE_SINGLE(_f, _s, _v, vmstate_info_float64, float64) + +#define VMSTATE_FLOAT64(_f, _s) \ + VMSTATE_FLOAT64_V(_f, _s, 0) + #define VMSTATE_TIMER_TEST(_f, _s, _test) \ VMSTATE_POINTER_TEST(_f, _s, _test, vmstate_info_timer, QEMUTimer *) @@ -576,6 +585,12 @@ extern const VMStateInfo vmstate_info_unused_buffer; #define VMSTATE_INT64_ARRAY(_f, _s, _n) \ VMSTATE_INT64_ARRAY_V(_f, _s, _n, 0) +#define VMSTATE_FLOAT64_ARRAY_V(_f, _s, _n, _v) \ + VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_float64, float64) + +#define VMSTATE_FLOAT64_ARRAY(_f, _s, _n) \ + VMSTATE_FLOAT64_ARRAY_V(_f, _s, _n, 0) + #define VMSTATE_BUFFER_V(_f, _s, _v) \ VMSTATE_STATIC_BUFFER(_f, _s, _v, NULL, 0, sizeof(typeof_field(_s, _f)))