@@ -585,15 +585,12 @@ extern const VMStateInfo vmstate_info_bitmap;
#define VMSTATE_UINT16_EQUAL(_f, _s) \
VMSTATE_UINT16_EQUAL_TEST(_f, _s, NULL)
+#define VMSTATE_UINT32_EQUAL(_f, _s) \
+ VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_uint32_equal, uint32_t)
+
#define VMSTATE_INT32_EQUAL(_f, _s) \
VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_equal, int32_t)
-#define VMSTATE_UINT32_EQUAL_V(_f, _s, _v) \
- VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint32_equal, uint32_t)
-
-#define VMSTATE_UINT32_EQUAL(_f, _s) \
- VMSTATE_UINT32_EQUAL_V(_f, _s, 0)
-
#define VMSTATE_UINT64_EQUAL_V(_f, _s, _v) \
VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64_equal, uint64_t)
@@ -372,6 +372,7 @@ static const VMStateDescription vmstate_simple_compare = {
VMSTATE_UINT16_EQUAL(u16_1, TestSimple),
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_END_OF_LIST()
}
};
@@ -380,6 +381,7 @@ uint8_t wire_simple_compare[] = {
/* u8_1 */ 0x82,
/* u16_1 */ 0x02, 0x00,
/* u16_3 */ 0x02, 0x01,
+ /* u32_1 */ 0x00, 0x01, 0x11, 0x70,
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
Remove unused VMSTATE_UINT32_EQUAL_V. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/vmstate.h | 9 +++------ tests/test-vmstate.c | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-)