@@ -636,6 +636,9 @@ extern const VMStateInfo vmstate_info_bitmap;
#define VMSTATE_INT64_ARRAY(_f, _s, _n) \
VMSTATE_ARRAY_TEST(_f, _s, _n, NULL, vmstate_info_int64, int64_t)
+#define VMSTATE_FLOAT64_ARRAY(_f, _s, _n) \
+ VMSTATE_ARRAY_TEST(_f, _s, _n, NULL, vmstate_info_float64, float64)
+
#define VMSTATE_UINT16_2DARRAY_V(_f, _s, _n1, _n2, _v) \
VMSTATE_2DARRAY(_f, _s, _n1, _n2, _v, vmstate_info_uint16, uint16_t)
@@ -660,12 +663,6 @@ extern const VMStateInfo vmstate_info_bitmap;
#define VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) \
VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint32, uint32_t)
-#define VMSTATE_FLOAT64_ARRAY_V(_f, _s, _n, _v) \
- VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_float64, float64)
-
-#define VMSTATE_FLOAT64_ARRAY(_f, _s, _n) \
- VMSTATE_FLOAT64_ARRAY_V(_f, _s, _n, 0)
-
#define VMSTATE_BUFFER_V(_f, _s, _v) \
VMSTATE_STATIC_BUFFER(_f, _s, _v, NULL, 0, sizeof(typeof_field(_s, _f)))
@@ -523,6 +523,7 @@ typedef struct TestArray {
int32_t i32_1[VMSTATE_ARRAY_SIZE];
int32_t i32_2[VMSTATE_ARRAY_SIZE];
int64_t i64_1[VMSTATE_ARRAY_SIZE];
+ float64 f64_1[VMSTATE_ARRAY_SIZE];
} TestArray;
TestArray obj_array = {
@@ -540,6 +541,8 @@ TestArray obj_array = {
.i32_1 = {51, 52, 53, 54, 55},
.i32_2 = {55, 54, 53, 52, 51},
.i64_1 = {61, 62, 63, 64, 65},
+ .f64_1 = {float64_zero, float64_one, float64_ln2, float64_pi,
+ float64_infinity},
};
static const VMStateDescription vmstate_array_primitive = {
@@ -557,6 +560,7 @@ static const VMStateDescription vmstate_array_primitive = {
VMSTATE_INT16_ARRAY(i16_1, TestArray, VMSTATE_ARRAY_SIZE),
VMSTATE_INT32_ARRAY(i32_1, TestArray, VMSTATE_ARRAY_SIZE),
VMSTATE_INT64_ARRAY(i64_1, TestArray, VMSTATE_ARRAY_SIZE),
+ VMSTATE_FLOAT64_ARRAY(f64_1, TestArray, VMSTATE_ARRAY_SIZE),
VMSTATE_END_OF_LIST()
}
};
@@ -583,6 +587,11 @@ uint8_t wire_array_primitive[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,
+ /* f64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x3f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x3f, 0xe6, 0x2e, 0x42, 0xfe, 0xfa, 0x39, 0xef,
+ 0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18,
+ 0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
@@ -608,6 +617,7 @@ static void obj_array_copy(void *arg1, void *arg2)
target->i32_1[i] = source->i32_1[i];
target->i32_2[i] = source->i32_2[i];
target->i64_1[i] = source->i64_1[i];
+ target->f64_1[i] = source->f64_1[i];
}
}
@@ -644,6 +654,7 @@ static void test_array_primitive(void)
ELEM_EQUAL(i16_1, i);
ELEM_EQUAL(i32_1, i);
ELEM_EQUAL(i64_1, i);
+ ELEM_EQUAL(f64_1, i);
}
}
Remove unused VMSTATE_FLOAT64_ARRAY_V. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/vmstate.h | 9 +++------ tests/test-vmstate.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-)