| Message ID | 20170216121140.9061-6-pasic@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
* Halil Pasic (pasic@linux.vnet.ibm.com) wrote: > Let's have a test for ptr arrays to some primitive type with some > not-null and null ptrs intermixed. > > Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com> > > --- > > Mainly for the sake of completeness and also to demonstrate that it works > since in the previous version I wrongly stated it does not. If guys think > we do not need this, I'm happy with just dropping it. > --- > tests/test-vmstate.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > > diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c > index b68a0b3..82ab743 100644 > --- a/tests/test-vmstate.c > +++ b/tests/test-vmstate.c > @@ -590,6 +590,64 @@ static void test_arr_ptr_str_0_load(void) > } > } > > +typedef struct TestArrayOfPtrToInt { > + int32_t *ar[AR_SIZE]; > +} TestArrayOfPtrToInt; > + > +const VMStateDescription vmsd_arpp = { > + .name = "test/arps", > + .version_id = 1, > + .minimum_version_id = 1, > + .fields = (VMStateField[]) { > + VMSTATE_ARRAY_OF_POINTER(ar, TestArrayOfPtrToInt, > + AR_SIZE, 0, vmstate_info_int32, int32_t*), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static void test_arr_ptr_prim_0_save(void) > +{ > + int32_t ar[AR_SIZE] = {0 , 1, 2, 3}; > + TestArrayOfPtrToInt sample = {.ar = {&ar[0], NULL, &ar[2], &ar[3]} }; > + uint8_t wire_sample[] = { > + 0x00, 0x00, 0x00, 0x00, > + VMS_NULLPTR_MARKER, > + 0x00, 0x00, 0x00, 0x02, > + 0x00, 0x00, 0x00, 0x03, > + QEMU_VM_EOF > + }; > + > + save_vmstate(&vmsd_arpp, &sample); > + compare_vmstate(wire_sample, sizeof(wire_sample)); > +} > + > +static void test_arr_ptr_prim_0_load(void) > +{ > + int32_t ar_gt[AR_SIZE] = {0, 1, 2, 3}; > + int32_t ar[AR_SIZE] = {3 , 42, 1, 0}; > + TestArrayOfPtrToInt obj = {.ar = {&ar[0], NULL, &ar[2], &ar[3]} }; > + int idx; > + uint8_t wire_sample[] = { > + 0x00, 0x00, 0x00, 0x00, > + VMS_NULLPTR_MARKER, > + 0x00, 0x00, 0x00, 0x02, > + 0x00, 0x00, 0x00, 0x03, > + QEMU_VM_EOF > + }; Again you could share the wire_sample and ar_gt between these two functions, other than that: Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Dave > + save_buffer(wire_sample, sizeof(wire_sample)); > + SUCCESS(load_vmstate_one(&vmsd_arpp, &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 */ > + if (idx == 1) { > + g_assert_cmpint(42, ==, ar[idx]); > + } else { > + g_assert_cmpint(ar_gt[idx], ==, ar[idx]); > + } > + } > +} > + > /* test QTAILQ migration */ > typedef struct TestQtailqElement TestQtailqElement; > > @@ -843,6 +901,10 @@ int main(int argc, char **argv) > g_test_add_func("/vmstate/array/ptr/str/0/save", test_arr_ptr_str_0_save); > g_test_add_func("/vmstate/array/ptr/str/0/load", > test_arr_ptr_str_0_load); > + g_test_add_func("/vmstate/array/ptr/prim/0/save", > + test_arr_ptr_prim_0_save); > + g_test_add_func("/vmstate/array/ptr/prim/0/load", > + test_arr_ptr_prim_0_load); > g_test_add_func("/vmstate/qtailq/save/saveq", test_save_q); > g_test_add_func("/vmstate/qtailq/load/loadq", test_load_q); > g_test_add_func("/vmstate/tmp_struct", test_tmp_struct); > -- > 2.8.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index b68a0b3..82ab743 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -590,6 +590,64 @@ static void test_arr_ptr_str_0_load(void) } } +typedef struct TestArrayOfPtrToInt { + int32_t *ar[AR_SIZE]; +} TestArrayOfPtrToInt; + +const VMStateDescription vmsd_arpp = { + .name = "test/arps", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_ARRAY_OF_POINTER(ar, TestArrayOfPtrToInt, + AR_SIZE, 0, vmstate_info_int32, int32_t*), + VMSTATE_END_OF_LIST() + } +}; + +static void test_arr_ptr_prim_0_save(void) +{ + int32_t ar[AR_SIZE] = {0 , 1, 2, 3}; + TestArrayOfPtrToInt sample = {.ar = {&ar[0], NULL, &ar[2], &ar[3]} }; + uint8_t wire_sample[] = { + 0x00, 0x00, 0x00, 0x00, + VMS_NULLPTR_MARKER, + 0x00, 0x00, 0x00, 0x02, + 0x00, 0x00, 0x00, 0x03, + QEMU_VM_EOF + }; + + save_vmstate(&vmsd_arpp, &sample); + compare_vmstate(wire_sample, sizeof(wire_sample)); +} + +static void test_arr_ptr_prim_0_load(void) +{ + int32_t ar_gt[AR_SIZE] = {0, 1, 2, 3}; + int32_t ar[AR_SIZE] = {3 , 42, 1, 0}; + TestArrayOfPtrToInt obj = {.ar = {&ar[0], NULL, &ar[2], &ar[3]} }; + int idx; + uint8_t wire_sample[] = { + 0x00, 0x00, 0x00, 0x00, + VMS_NULLPTR_MARKER, + 0x00, 0x00, 0x00, 0x02, + 0x00, 0x00, 0x00, 0x03, + QEMU_VM_EOF + }; + + save_buffer(wire_sample, sizeof(wire_sample)); + SUCCESS(load_vmstate_one(&vmsd_arpp, &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 */ + if (idx == 1) { + g_assert_cmpint(42, ==, ar[idx]); + } else { + g_assert_cmpint(ar_gt[idx], ==, ar[idx]); + } + } +} + /* test QTAILQ migration */ typedef struct TestQtailqElement TestQtailqElement; @@ -843,6 +901,10 @@ int main(int argc, char **argv) g_test_add_func("/vmstate/array/ptr/str/0/save", test_arr_ptr_str_0_save); g_test_add_func("/vmstate/array/ptr/str/0/load", test_arr_ptr_str_0_load); + g_test_add_func("/vmstate/array/ptr/prim/0/save", + test_arr_ptr_prim_0_save); + g_test_add_func("/vmstate/array/ptr/prim/0/load", + test_arr_ptr_prim_0_load); g_test_add_func("/vmstate/qtailq/save/saveq", test_save_q); g_test_add_func("/vmstate/qtailq/load/loadq", test_load_q); g_test_add_func("/vmstate/tmp_struct", test_tmp_struct);
Let's have a test for ptr arrays to some primitive type with some not-null and null ptrs intermixed. Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com> --- Mainly for the sake of completeness and also to demonstrate that it works since in the previous version I wrongly stated it does not. If guys think we do not need this, I'm happy with just dropping it. --- tests/test-vmstate.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)