[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 4/8] tests/test-vmstate.c: add array of point
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [RFC PATCH v2 4/8] tests/test-vmstate.c: add array of pointer to struct |
Date: |
Tue, 8 Nov 2016 10:55:59 +0100 |
Increase test coverage by adding tests for the macro
VMSTATE_ARRAY_OF_POINTER_TO_STRUCT.
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Guenther Hutzl <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
_No review needed!_ Already included but not in master yet. See:
https://lists.gnu.org/archive/html/qemu-devel/2016-11/msg00335.html
---
tests/test-vmstate.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 9062d6b..aa1ccf1 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -510,6 +510,20 @@ static const VMStateDescription vmstate_vbuffer = {
}
};
+typedef struct {
+ int32_t i;
+} TestStructTriv;
+
+const VMStateDescription vmsd_tst = {
+ .name = "test/tst",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_INT32(i, TestStructTriv),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
uint8_t wire_vbuffer[] = {
/* u8_1 */ 0x64,
/* vBuffer_1 */ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
@@ -582,6 +596,60 @@ static void test_complex_vbuffer(void)
}
#undef FIELD_EQUAL
#undef BUFFER_EQUAL
+#define AR_SIZE 4
+
+typedef struct {
+ TestStructTriv *ar[AR_SIZE];
+} TestArrayOfPtrToStuct;
+
+const VMStateDescription vmsd_arps = {
+ .name = "test/arps",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_ARRAY_OF_POINTER_TO_STRUCT(ar, TestArrayOfPtrToStuct,
+ AR_SIZE, 0, vmsd_tst, TestStructTriv),
+ VMSTATE_END_OF_LIST()
+ }
+};
+static void test_arr_ptr_str_no0_save(void)
+{
+ TestStructTriv ar[AR_SIZE] = {{.i = 0}, {.i = 1}, {.i = 2}, {.i = 3} };
+ TestArrayOfPtrToStuct sample = {.ar = {&ar[0], &ar[1], &ar[2], &ar[3]} };
+ uint8_t wire_sample[] = {
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x01,
+ 0x00, 0x00, 0x00, 0x02,
+ 0x00, 0x00, 0x00, 0x03,
+ QEMU_VM_EOF
+ };
+
+ save_vmstate(&vmsd_arps, &sample);
+ compare_vmstate(wire_sample, sizeof(wire_sample));
+}
+
+static void test_arr_ptr_str_no0_load(void)
+{
+ TestStructTriv ar_gt[AR_SIZE] = {{.i = 0}, {.i = 1}, {.i = 2}, {.i = 3} };
+ TestStructTriv ar[AR_SIZE] = {};
+ TestArrayOfPtrToStuct obj = {.ar = {&ar[0], &ar[1], &ar[2], &ar[3]} };
+ int idx;
+ uint8_t wire_sample[] = {
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x01,
+ 0x00, 0x00, 0x00, 0x02,
+ 0x00, 0x00, 0x00, 0x03,
+ QEMU_VM_EOF
+ };
+
+ save_buffer(wire_sample, sizeof(wire_sample));
+ SUCCESS(load_vmstate_one(&vmsd_arps, &obj, 1,
+ wire_sample, sizeof(wire_sample)));
+ for (idx = 0; idx < AR_SIZE; ++idx) {
+ /* compare the target array ar with the ground truth array ar_gt */
+ g_assert_cmpint(ar_gt[idx].i, ==, ar[idx].i);
+ }
+}
int main(int argc, char **argv)
{
@@ -598,6 +666,10 @@ int main(int argc, char **argv)
g_test_add_func("/vmstate/field_exists/save/noskip", test_save_noskip);
g_test_add_func("/vmstate/field_exists/save/skip", test_save_skip);
g_test_add_func("/vmstate/complex/vbuffer", test_complex_vbuffer);
+ g_test_add_func("/vmstate/array/ptr/str/no0/save",
+ test_arr_ptr_str_no0_save);
+ g_test_add_func("/vmstate/array/ptr/str/no0/load",
+ test_arr_ptr_str_no0_load);
g_test_run();
close(temp_fd);
--
2.8.4
- [Qemu-devel] [RFC PATCH v2 0/8] VMS_ARRAY_OF_POINTER with null pointers, Halil Pasic, 2016/11/08
- [Qemu-devel] [RFC PATCH v2 4/8] tests/test-vmstate.c: add array of pointer to struct,
Halil Pasic <=
- [Qemu-devel] [RFC PATCH v2 1/8] tests/test-vmstate.c: add vBuffer test, Halil Pasic, 2016/11/08
- [Qemu-devel] [RFC PATCH v2 7/8] migration/vmstate: fix array of pointers to struct, Halil Pasic, 2016/11/08
- [Qemu-devel] [RFC PATCH v2 8/8] tests/test-vmstate.c: add array of pointers to struct with NULL, Halil Pasic, 2016/11/08
- [Qemu-devel] [RFC PATCH v2 3/8] tests/test-vmstate.c: add save_buffer util func, Halil Pasic, 2016/11/08
- [Qemu-devel] [RFC PATCH v2 2/8] migration: drop unused VMStateField.start, Halil Pasic, 2016/11/08
- [Qemu-devel] [RFC PATCH v2 5/8] migration/vmstate: renames in (load|save)_state, Halil Pasic, 2016/11/08
- [Qemu-devel] [RFC PATCH v2 6/8] migration/vmstate: split up vmstate_base_addr, Halil Pasic, 2016/11/08