[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 36/97] vmstate: Test for VMSTATE_INT16_ARRAY
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 36/97] vmstate: Test for VMSTATE_INT16_ARRAY |
Date: |
Mon, 7 Apr 2014 05:20:54 +0200 |
Remove unused VMSTATE_INT16_ARRAY_V
Signed-off-by: Juan Quintela <address@hidden>
---
include/migration/vmstate.h | 9 +++------
tests/test-vmstate.c | 5 +++++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 3271114..5e62206 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -624,6 +624,9 @@ extern const VMStateInfo vmstate_info_bitmap;
#define VMSTATE_UINT64_ARRAY(_f, _s, _n) \
VMSTATE_UINT64_ARRAY_TEST(_f, _s, _n, NULL)
+#define VMSTATE_INT16_ARRAY(_f, _s, _n) \
+ VMSTATE_ARRAY_TEST(_f, _s, _n, NULL, vmstate_info_int16, int16_t)
+
#define VMSTATE_UINT16_2DARRAY_V(_f, _s, _n1, _n2, _v) \
VMSTATE_2DARRAY(_f, _s, _n1, _n2, _v, vmstate_info_uint16, uint16_t)
@@ -645,12 +648,6 @@ extern const VMStateInfo vmstate_info_bitmap;
#define VMSTATE_UINT32_2DARRAY(_f, _s, _n1, _n2) \
VMSTATE_UINT32_2DARRAY_V(_f, _s, _n1, _n2, 0)
-#define VMSTATE_INT16_ARRAY_V(_f, _s, _n, _v) \
- VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int16, int16_t)
-
-#define VMSTATE_INT16_ARRAY(_f, _s, _n) \
- VMSTATE_INT16_ARRAY_V(_f, _s, _n, 0)
-
#define VMSTATE_INT32_ARRAY_V(_f, _s, _n, _v) \
VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int32, int32_t)
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 1f50948..e800be0 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -547,6 +547,7 @@ typedef struct TestArray {
uint32_t u32_2[VMSTATE_ARRAY_SIZE];
uint64_t u64_1[VMSTATE_ARRAY_SIZE];
uint64_t u64_2[VMSTATE_ARRAY_SIZE];
+ int16_t i16_1[VMSTATE_ARRAY_SIZE];
} TestArray;
TestArray obj_array = {
@@ -560,6 +561,7 @@ TestArray obj_array = {
.u32_2 = {25, 24, 23, 22, 21},
.u64_1 = {31, 32, 33, 34, 35},
.u64_2 = {35, 34, 33, 32, 31},
+ .i16_1 = {41, 42, 43, 44, 45},
};
static const VMStateDescription vmstate_array_primitive = {
@@ -574,6 +576,7 @@ static const VMStateDescription vmstate_array_primitive = {
VMSTATE_UINT16_ARRAY(u16_1, TestArray, VMSTATE_ARRAY_SIZE),
VMSTATE_UINT32_ARRAY(u32_1, TestArray, VMSTATE_ARRAY_SIZE),
VMSTATE_UINT64_ARRAY(u64_1, TestArray, VMSTATE_ARRAY_SIZE),
+ VMSTATE_INT16_ARRAY(i16_1, TestArray, VMSTATE_ARRAY_SIZE),
VMSTATE_END_OF_LIST()
}
};
@@ -591,6 +594,7 @@ uint8_t wire_array_primitive[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23,
+ /* i16_1 */ 0x00, 0x29, 0x00, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x00, 0x2d,
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
@@ -650,6 +654,7 @@ static void test_array_primitive(void)
ELEM_ASSERT(u16_1, i);
ELEM_ASSERT(u32_1, i);
ELEM_ASSERT(u64_1, i);
+ ELEM_ASSERT(i16_1, i);
}
/* We save the file again. We want the EOF this time */
--
1.9.0
- [Qemu-devel] [PATCH 31/97] vmstate: Test for VMSTATE_ARRAY_BOOL_TEST, (continued)
- [Qemu-devel] [PATCH 31/97] vmstate: Test for VMSTATE_ARRAY_BOOL_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 29/97] vmstate: s/VMSTATE_INT32_LE/VMSTATE_INT32_POSITIVE_LE/, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 30/97] vmstate: Move VMSTATE_TIMER_V to VMSTATE_TIMER_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 32/97] vmstate: Test for VMSTATE_UINT8_ARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 27/97] vmstate: Test for VMSTATE_INT32_EQUAL, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 34/97] vmstate: Test for VMSTATE_UINT32_ARRAY{_TEST}, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 33/97] vmstate: Test for VMSTATE_UINT16_ARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 35/97] vmstate: Test for VMSTATE_UINT64_ARRAY{_TEST}, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 37/97] vmstate: Test for VMSTATE_INT32_ARRAY{_TEST}, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 40/97] vmstate: Test for VMSTATE_UINT8_2DARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 36/97] vmstate: Test for VMSTATE_INT16_ARRAY,
Juan Quintela <=
- [Qemu-devel] [PATCH 39/97] vmstate: Test for VMSTATE_FLOAT64_ARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 38/97] vmstate: Test for VMSTATE_INT64_ARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 41/97] vmstate: Test for VMSTATE_UINT16_2DARRAY., Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 42/97] vmstate: Test for VMSTATE_UINT32_2DARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 44/97] vmstate: Remove version from VMSTATE_BUFFER_UNSAFE, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 43/97] vmstate: Remove unused VMSTATE_BUFFER_V, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 46/97] vmstate: All ptimers users were at least at version 1 or more, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 45/97] vmstate: Remove unused version fields from ARM, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 47/97] vmstate: remove version from all variants of VMSTATE_STRUCT_POINTER*, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 48/97] vmstate: Port last 3 users of VMSTATE_ARRAY to VMSTATE_ARRAY_TEST, Juan Quintela, 2014/04/06