From patchwork Mon Apr 21 14:40:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 341069 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6F92E1400EF for ; Tue, 22 Apr 2014 13:18:09 +1000 (EST) Received: from localhost ([::1]:49349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFfv-0002bi-Gc for incoming@patchwork.ozlabs.org; Mon, 21 Apr 2014 10:58:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFQS-0003j4-Ed for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:42:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcFQM-0003yX-9Z for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:42:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFQL-0003yO-W5 for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:42:22 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEgLVB001957 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 21 Apr 2014 10:42:21 -0400 Received: from trasno.mitica (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEfi6V019220; Mon, 21 Apr 2014 10:42:20 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 21 Apr 2014 16:40:05 +0200 Message-Id: <1398091304-10677-26-git-send-email-quintela@redhat.com> In-Reply-To: <1398091304-10677-1-git-send-email-quintela@redhat.com> References: <1398091304-10677-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 025/124] vmstate: Test for VMSTATE_FLOAT64 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 Remove unused VMSTATE_FLOAT64_V. Signed-off-by: Juan Quintela --- include/migration/vmstate.h | 5 +---- tests/test-vmstate.c | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 0940340..717c7fb 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -596,11 +596,8 @@ extern const VMStateInfo vmstate_info_bitmap; VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_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) + VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_float64, float64) #define VMSTATE_TIMER_TEST(_f, _s, _test) \ VMSTATE_POINTER_TEST(_f, _s, _test, vmstate_info_timer, QEMUTimer *) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 4a6a56d..c6ceec6 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -158,6 +158,7 @@ typedef struct TestSimple { int16_t i16_1, i16_2; int32_t i32_1, i32_2; int64_t i64_1, i64_2; + float64 f64; } TestSimple; /* Object instantiation, we are going to use it in more than one test */ @@ -181,6 +182,7 @@ TestSimple obj_simple = { .i32_2 = -70000, .i64_1 = 12121212, .i64_2 = -12121212, + .f64 = float64_pi, }; /* Description of the values. If you add a primitive type @@ -205,6 +207,7 @@ static const VMStateDescription vmstate_simple_primitive = { VMSTATE_INT32(i32_2, TestSimple), VMSTATE_INT64(i64_1, TestSimple), VMSTATE_INT64(i64_2, TestSimple), + VMSTATE_FLOAT64(f64, TestSimple), VMSTATE_END_OF_LIST() } }; @@ -236,6 +239,7 @@ uint8_t wire_simple_primitive[] = { /* i32_2 */ 0xff, 0xfe, 0xee, 0x90, /* i64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf4, 0x7c, /* i64_2 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0x47, 0x0b, 0x84, + /* f64 */ 0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18, QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ }; @@ -273,6 +277,7 @@ static void test_simple_primitive(void) FIELD_EQUAL(i32_2); FIELD_EQUAL(i64_1); FIELD_EQUAL(i64_2); + FIELD_EQUAL(f64); } static bool test_true(void *opaque, int version_id)