From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08p-0005mz-Sp for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX08j-0008EG-Nq for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08j-0008E5-F0 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:29 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s373MRZq005750 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:22:28 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:20:38 +0200 Message-Id: <1396840915-10384-21-git-send-email-quintela@redhat.com> In-Reply-To: <1396840915-10384-1-git-send-email-quintela@redhat.com> References: <1396840915-10384-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 20/97] vmstate: Test for VMSTATE_FLOAT64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 25032ef..eec4b13 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 632c7a7..21f02ad 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -66,6 +66,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 */ @@ -89,6 +90,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 @@ -113,6 +115,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() } }; @@ -144,6 +147,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 */ }; @@ -209,6 +213,7 @@ static void test_simple_primitive(void) FIELD_ASSERT(i32_2); FIELD_ASSERT(i64_1); FIELD_ASSERT(i64_2); + FIELD_ASSERT(f64); /* We save the file again. We want the EOF this time */ -- 1.9.0