* Halil Pasic (pa...@linux.vnet.ibm.com) wrote:
> Add test for VMSTATE_ARRAY_OF_POINTER_TO_STRUCT with an array
> containing some null pointer.
>
> Signed-off-by: Halil Pasic <pa...@linux.vnet.ibm.com>
> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> tests/test-vmstate.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 51 insertions(+)
>
> diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
> index d0dd390..b68a0b3 100644
> --- a/tests/test-vmstate.c
> +++ b/tests/test-vmstate.c
> @@ -487,6 +487,8 @@ const VMStateDescription vmsd_tst = {
> }
> };
>
> +/* test array migration */
> +
> #define AR_SIZE 4
>
> typedef struct {
> @@ -542,6 +544,52 @@ static void test_arr_ptr_str_no0_load(void)
> }
> }
>
> +static void test_arr_ptr_str_0_save(void)
> +{
> + TestStructTriv ar[AR_SIZE] = {{.i = 0}, {.i = 1}, {.i = 2}, {.i = 3} };
> + TestArrayOfPtrToStuct 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_arps, &sample);
> + compare_vmstate(wire_sample, sizeof(wire_sample));
> +}
> +
> +static void test_arr_ptr_str_0_load(void)
> +{
> + TestStructTriv ar_gt[AR_SIZE] = {{.i = 0}, {.i = 0}, {.i = 2}, {.i = 3}
> };
> + TestStructTriv ar[AR_SIZE] = {};
> + TestArrayOfPtrToStuct 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
> + };
If possible; it would be better if you could share the wire_sample, and ar_gt
between
the two functions rather than copying them.
Dave
> + 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);
> + }
> + for (idx = 0; idx < AR_SIZE; ++idx) {
> + if (idx == 1) {
> + g_assert_cmpint((uint64_t)(obj.ar[idx]), ==, 0);
> + } else {
> + g_assert_cmpint((uint64_t)(obj.ar[idx]), !=, 0);
> + }
> + }
> +}
> +
> /* test QTAILQ migration */
> typedef struct TestQtailqElement TestQtailqElement;
>
> @@ -792,6 +840,9 @@ int main(int argc, char **argv)
> test_arr_ptr_str_no0_save);
> g_test_add_func("/vmstate/array/ptr/str/no0/load",
> test_arr_ptr_str_no0_load);
> + 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/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 / dgilb...@redhat.com / Manchester, UK
