Remove VMSTATES_INT16_V, we are removing versioning, would use only tests.
Signed-off-by: Juan Quintela <quint...@redhat.com>
---
include/migration/vmstate.h | 6 +++---
tests/test-vmstate.c | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index a962735..d8febd5 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -540,8 +540,8 @@ extern const VMStateInfo vmstate_info_bitmap;
#define VMSTATE_INT8_TEST(_f, _s, _t) \
VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int8, int8_t)
-#define VMSTATE_INT16_V(_f, _s, _v) \
- VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int16, int16_t)
+#define VMSTATE_INT16_TEST(_f, _s, _t) \
+ VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int16, int16_t)
#define VMSTATE_INT32_V(_f, _s, _v) \
VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int32, int32_t)
#define VMSTATE_INT64_V(_f, _s, _v) \
@@ -562,7 +562,7 @@ extern const VMStateInfo vmstate_info_bitmap;
#define VMSTATE_INT8(_f, _s) \
VMSTATE_INT8_TEST(_f, _s, NULL)
#define VMSTATE_INT16(_f, _s) \
- VMSTATE_INT16_V(_f, _s, 0)
+ VMSTATE_INT16_TEST(_f, _s, NULL)
#define VMSTATE_INT32(_f, _s) \
VMSTATE_INT32_V(_f, _s, 0)
#define VMSTATE_INT64(_f, _s) \
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index c62e22c..e0b2147 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -291,6 +291,8 @@ static const VMStateDescription vmstate_simple_test = {
VMSTATE_BOOL_TEST(b_2, TestSimple, test_false),
VMSTATE_INT8_TEST(i8_1, TestSimple, test_true),
VMSTATE_INT8_TEST(i8_2, TestSimple, test_false),
+ VMSTATE_INT16_TEST(i16_1, TestSimple, test_true),
+ VMSTATE_INT16_TEST(i16_2, TestSimple, test_false),
VMSTATE_END_OF_LIST()
}
};
@@ -298,6 +300,7 @@ static const VMStateDescription vmstate_simple_test = {
uint8_t wire_simple_test[] = {
/* b_1 */ 0x01,
/* i8_1 */ 0x41,
+ /* i16_1 */ 0x02, 0x00,
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
@@ -316,6 +319,7 @@ static void test_simple_test(void)
FIELD_EQUAL(b_1);
FIELD_EQUAL(i8_1);
+ FIELD_EQUAL(i16_1);
}
#undef FIELD_EQUAL
--
1.9.3
