mirror of https://gitee.com/openkylin/qemu.git
test-string-input-visitor: Use virtual walk
We now support virtual walks, so use that instead. Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20181121164421.20780-8-david@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
c9fba9de89
commit
1308859385
|
@ -115,7 +115,6 @@ static void test_visitor_in_intList(TestInputVisitorData *data,
|
|||
uint64_t expect5[] = { UINT64_MAX };
|
||||
Error *err = NULL;
|
||||
int64List *res = NULL;
|
||||
int64List *tail;
|
||||
Visitor *v;
|
||||
int64_t val;
|
||||
|
||||
|
@ -188,39 +187,28 @@ static void test_visitor_in_intList(TestInputVisitorData *data,
|
|||
|
||||
v = visitor_input_test_init(data, "0,2-3");
|
||||
|
||||
/* Would be simpler if the visitor genuinely supported virtual walks */
|
||||
visit_start_list(v, NULL, (GenericList **)&res, sizeof(*res),
|
||||
&error_abort);
|
||||
tail = res;
|
||||
visit_type_int64(v, NULL, &tail->value, &error_abort);
|
||||
g_assert_cmpint(tail->value, ==, 0);
|
||||
tail = (int64List *)visit_next_list(v, (GenericList *)tail, sizeof(*res));
|
||||
g_assert(tail);
|
||||
visit_type_int64(v, NULL, &tail->value, &error_abort);
|
||||
g_assert_cmpint(tail->value, ==, 2);
|
||||
tail = (int64List *)visit_next_list(v, (GenericList *)tail, sizeof(*res));
|
||||
g_assert(tail);
|
||||
visit_start_list(v, NULL, NULL, 0, &error_abort);
|
||||
visit_type_int64(v, NULL, &val, &error_abort);
|
||||
g_assert_cmpint(val, ==, 0);
|
||||
visit_type_int64(v, NULL, &val, &error_abort);
|
||||
g_assert_cmpint(val, ==, 2);
|
||||
|
||||
visit_check_list(v, &err);
|
||||
error_free_or_abort(&err);
|
||||
visit_end_list(v, (void **)&res);
|
||||
|
||||
qapi_free_int64List(res);
|
||||
visit_end_list(v, NULL);
|
||||
|
||||
/* Visit beyond end of list */
|
||||
|
||||
v = visitor_input_test_init(data, "0");
|
||||
|
||||
visit_start_list(v, NULL, (GenericList **)&res, sizeof(*res),
|
||||
&error_abort);
|
||||
tail = res;
|
||||
visit_type_int64(v, NULL, &tail->value, &err);
|
||||
g_assert_cmpint(tail->value, ==, 0);
|
||||
visit_start_list(v, NULL, NULL, 0, &error_abort);
|
||||
visit_type_int64(v, NULL, &val, &err);
|
||||
g_assert_cmpint(val, ==, 0);
|
||||
visit_type_int64(v, NULL, &val, &err);
|
||||
error_free_or_abort(&err);
|
||||
visit_check_list(v, &error_abort);
|
||||
visit_end_list(v, (void **)&res);
|
||||
|
||||
qapi_free_int64List(res);
|
||||
visit_check_list(v, &error_abort);
|
||||
visit_end_list(v, NULL);
|
||||
}
|
||||
|
||||
static void test_visitor_in_bool(TestInputVisitorData *data,
|
||||
|
|
Loading…
Reference in New Issue