[Qemu-devel] [PATCH 24/27] vmstate: Test for VMSTATE_UINT64_EQUAL

[Juan Quintela]

Remove unused VMSTATE_UINT64_EQUAL_V.

Signed-off-by: Juan Quintela <address@hidden>
---
 include/migration/vmstate.h | 10 +++-------
 tests/test-vmstate.c        |  2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 73fd6c6..4fe199a 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -588,19 +588,15 @@ extern const VMStateInfo vmstate_info_bitmap;
 #define VMSTATE_UINT32_EQUAL(_f, _s)                                  \
     VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_uint32_equal, uint32_t)

+#define VMSTATE_UINT64_EQUAL(_f, _s)                                  \
+    VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_uint64_equal, uint64_t)
+
 #define VMSTATE_INT32_EQUAL(_f, _s)                                   \
     VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_equal, int32_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_POSITIVE_LE(_f, _s)                             \
     VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_t)

-
 #define VMSTATE_FLOAT64(_f, _s)                                       \
     VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_float64, float64)

diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index a2b707e..4e7f951 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -373,6 +373,7 @@ static const VMStateDescription vmstate_simple_compare = {
         VMSTATE_UINT16_EQUAL_TEST(u16_2, TestSimple, test_false),
         VMSTATE_UINT16_EQUAL_TEST(u16_3, TestSimple, test_true),
         VMSTATE_UINT32_EQUAL(u32_1, TestSimple),
+        VMSTATE_UINT64_EQUAL(u64_1, TestSimple),
         VMSTATE_END_OF_LIST()
     }
 };
@@ -382,6 +383,7 @@ uint8_t wire_simple_compare[] = {
     /* u16_1 */ 0x02, 0x00,
     /* u16_3 */ 0x02, 0x01,
     /* u32_1 */ 0x00, 0x01, 0x11, 0x70,
+    /* u64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf4, 0x7c,
     QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
 };

-- 
1.9.3