2012-02-09 18:21:03 +08:00
|
|
|
/*
|
|
|
|
|
* String Input Visitor unit-tests.
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2012 Red Hat Inc.
|
|
|
|
|
*
|
|
|
|
|
* Authors:
|
2016-09-30 22:45:27 +08:00
|
|
|
* Paolo Bonzini <pbonzini@redhat.com> (based on test-qobject-input-visitor)
|
2012-02-09 18:21:03 +08:00
|
|
|
*
|
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
|
|
* See the COPYING file in the top-level directory.
|
|
|
|
|
*/
|
|
|
|
|
|
2016-02-09 02:08:51 +08:00
|
|
|
#include "qemu/osdep.h"
|
2012-02-09 18:21:03 +08:00
|
|
|
|
2012-12-06 18:22:34 +08:00
|
|
|
#include "qemu-common.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 16:01:28 +08:00
|
|
|
#include "qapi/error.h"
|
2012-02-09 18:21:03 +08:00
|
|
|
#include "qapi/string-input-visitor.h"
|
|
|
|
|
#include "test-qapi-visit.h"
|
|
|
|
|
|
|
|
|
|
typedef struct TestInputVisitorData {
|
2016-06-10 00:48:37 +08:00
|
|
|
Visitor *v;
|
2012-02-09 18:21:03 +08:00
|
|
|
} TestInputVisitorData;
|
|
|
|
|
|
|
|
|
|
static void visitor_input_teardown(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
2016-06-10 00:48:37 +08:00
|
|
|
if (data->v) {
|
|
|
|
|
visit_free(data->v);
|
|
|
|
|
data->v = NULL;
|
2012-02-09 18:21:03 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is provided instead of a test setup function so that the JSON
|
|
|
|
|
string used by the tests are kept in the test functions (and not
|
|
|
|
|
int main()) */
|
|
|
|
|
static
|
|
|
|
|
Visitor *visitor_input_test_init(TestInputVisitorData *data,
|
|
|
|
|
const char *string)
|
|
|
|
|
{
|
2017-03-03 20:32:41 +08:00
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
2016-06-10 00:48:37 +08:00
|
|
|
data->v = string_input_visitor_new(string);
|
|
|
|
|
g_assert(data->v);
|
|
|
|
|
return data->v;
|
2012-02-09 18:21:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void test_visitor_in_int(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
|
|
|
|
int64_t res = 0, value = -42;
|
2014-05-02 19:26:29 +08:00
|
|
|
Error *err = NULL;
|
2012-02-09 18:21:03 +08:00
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "-42");
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_int(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpint(res, ==, value);
|
2016-04-29 05:45:29 +08:00
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "not an int");
|
|
|
|
|
|
|
|
|
|
visit_type_int(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
2017-03-21 00:13:43 +08:00
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "");
|
|
|
|
|
|
|
|
|
|
visit_type_int(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
2012-02-09 18:21:03 +08:00
|
|
|
}
|
|
|
|
|
|
2017-03-03 20:32:42 +08:00
|
|
|
static void check_ilist(Visitor *v, int64_t *expected, size_t n)
|
|
|
|
|
{
|
|
|
|
|
int64List *res = NULL;
|
|
|
|
|
int64List *tail;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
visit_type_int64List(v, NULL, &res, &error_abort);
|
|
|
|
|
tail = res;
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
|
g_assert(tail);
|
|
|
|
|
g_assert_cmpint(tail->value, ==, expected[i]);
|
|
|
|
|
tail = tail->next;
|
|
|
|
|
}
|
|
|
|
|
g_assert(!tail);
|
|
|
|
|
|
|
|
|
|
qapi_free_int64List(res);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void check_ulist(Visitor *v, uint64_t *expected, size_t n)
|
|
|
|
|
{
|
|
|
|
|
uint64List *res = NULL;
|
|
|
|
|
uint64List *tail;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
visit_type_uint64List(v, NULL, &res, &error_abort);
|
|
|
|
|
tail = res;
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
|
g_assert(tail);
|
|
|
|
|
g_assert_cmpuint(tail->value, ==, expected[i]);
|
|
|
|
|
tail = tail->next;
|
|
|
|
|
}
|
|
|
|
|
g_assert(!tail);
|
|
|
|
|
|
|
|
|
|
qapi_free_uint64List(res);
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-10 19:15:27 +08:00
|
|
|
static void test_visitor_in_intList(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
2018-11-22 00:44:18 +08:00
|
|
|
int64_t expect1[] = { 1, 2, 0, 2, 3, 4, 20, 5, 6, 7,
|
|
|
|
|
8, 9, 1, 2, 3, 4, 5, 6, 7, 8 };
|
2017-03-03 20:32:42 +08:00
|
|
|
int64_t expect2[] = { 32767, -32768, -32767 };
|
2018-11-22 00:44:18 +08:00
|
|
|
int64_t expect3[] = { INT64_MIN, INT64_MAX };
|
2018-11-22 00:44:17 +08:00
|
|
|
int64_t expect4[] = { 1 };
|
2018-11-22 00:44:21 +08:00
|
|
|
int64_t expect5[] = { INT64_MAX - 2, INT64_MAX - 1, INT64_MAX };
|
2016-04-29 05:45:29 +08:00
|
|
|
Error *err = NULL;
|
2017-03-03 20:32:42 +08:00
|
|
|
int64List *res = NULL;
|
2014-06-10 19:15:27 +08:00
|
|
|
Visitor *v;
|
2017-03-03 20:32:46 +08:00
|
|
|
int64_t val;
|
2017-03-03 20:32:42 +08:00
|
|
|
|
|
|
|
|
/* Valid lists */
|
2014-06-10 19:15:27 +08:00
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "1,2,0,2-4,20,5-9,1-8");
|
2017-03-03 20:32:42 +08:00
|
|
|
check_ilist(v, expect1, ARRAY_SIZE(expect1));
|
2014-06-10 19:15:27 +08:00
|
|
|
|
2017-03-03 20:32:42 +08:00
|
|
|
v = visitor_input_test_init(data, "32767,-32768--32767");
|
|
|
|
|
check_ilist(v, expect2, ARRAY_SIZE(expect2));
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data,
|
|
|
|
|
"-9223372036854775808,9223372036854775807");
|
|
|
|
|
check_ilist(v, expect3, ARRAY_SIZE(expect3));
|
|
|
|
|
|
2018-11-22 00:44:17 +08:00
|
|
|
v = visitor_input_test_init(data, "1-1");
|
|
|
|
|
check_ilist(v, expect4, ARRAY_SIZE(expect4));
|
|
|
|
|
|
2018-11-22 00:44:21 +08:00
|
|
|
v = visitor_input_test_init(data,
|
|
|
|
|
"9223372036854775805-9223372036854775807");
|
|
|
|
|
check_ilist(v, expect5, ARRAY_SIZE(expect5));
|
|
|
|
|
|
2018-11-22 00:44:17 +08:00
|
|
|
/* Value too large */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "9223372036854775808");
|
|
|
|
|
visit_type_int64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Value too small */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "-9223372036854775809");
|
|
|
|
|
visit_type_int64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Range not ascending */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "3-1");
|
|
|
|
|
visit_type_int64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "9223372036854775807-0");
|
|
|
|
|
visit_type_int64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Range too big (65536 is the limit against DOS attacks) */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "0-65536");
|
|
|
|
|
visit_type_int64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
2017-03-03 20:32:42 +08:00
|
|
|
|
2017-03-21 00:13:43 +08:00
|
|
|
/* Empty list */
|
2017-03-03 20:32:42 +08:00
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "");
|
2017-03-21 00:13:43 +08:00
|
|
|
visit_type_int64List(v, NULL, &res, &error_abort);
|
|
|
|
|
g_assert(!res);
|
2014-06-10 19:15:27 +08:00
|
|
|
|
2017-03-03 20:32:42 +08:00
|
|
|
/* Not a list */
|
2016-04-29 05:45:29 +08:00
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "not an int list");
|
|
|
|
|
|
2017-03-03 20:32:42 +08:00
|
|
|
visit_type_int64List(v, NULL, &res, &err);
|
2016-04-29 05:45:30 +08:00
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
2017-03-03 20:32:43 +08:00
|
|
|
|
|
|
|
|
/* Unvisited list tail */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "0,2-3");
|
|
|
|
|
|
2018-11-22 00:44:19 +08:00
|
|
|
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);
|
2017-03-03 20:32:45 +08:00
|
|
|
|
|
|
|
|
visit_check_list(v, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
2018-11-22 00:44:19 +08:00
|
|
|
visit_end_list(v, NULL);
|
2017-03-03 20:32:46 +08:00
|
|
|
|
|
|
|
|
/* Visit beyond end of list */
|
2018-11-22 00:44:19 +08:00
|
|
|
|
2017-03-03 20:32:46 +08:00
|
|
|
v = visitor_input_test_init(data, "0");
|
|
|
|
|
|
2018-11-22 00:44:19 +08:00
|
|
|
visit_start_list(v, NULL, NULL, 0, &error_abort);
|
|
|
|
|
visit_type_int64(v, NULL, &val, &err);
|
|
|
|
|
g_assert_cmpint(val, ==, 0);
|
2017-03-03 20:32:46 +08:00
|
|
|
visit_type_int64(v, NULL, &val, &err);
|
2018-11-22 00:44:18 +08:00
|
|
|
error_free_or_abort(&err);
|
2017-03-03 20:32:46 +08:00
|
|
|
|
2018-11-22 00:44:19 +08:00
|
|
|
visit_check_list(v, &error_abort);
|
|
|
|
|
visit_end_list(v, NULL);
|
2014-06-10 19:15:27 +08:00
|
|
|
}
|
|
|
|
|
|
2018-11-22 00:44:20 +08:00
|
|
|
static void test_visitor_in_uintList(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
|
|
|
|
uint64_t expect1[] = { 1, 2, 0, 2, 3, 4, 20, 5, 6, 7,
|
|
|
|
|
8, 9, 1, 2, 3, 4, 5, 6, 7, 8 };
|
|
|
|
|
uint64_t expect2[] = { 32767, -32768, -32767 };
|
|
|
|
|
uint64_t expect3[] = { INT64_MIN, INT64_MAX };
|
|
|
|
|
uint64_t expect4[] = { 1 };
|
|
|
|
|
uint64_t expect5[] = { UINT64_MAX };
|
2018-11-22 00:44:21 +08:00
|
|
|
uint64_t expect6[] = { UINT64_MAX - 2, UINT64_MAX - 1, UINT64_MAX };
|
2018-11-22 00:44:20 +08:00
|
|
|
Error *err = NULL;
|
|
|
|
|
uint64List *res = NULL;
|
|
|
|
|
Visitor *v;
|
|
|
|
|
uint64_t val;
|
|
|
|
|
|
|
|
|
|
/* Valid lists */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "1,2,0,2-4,20,5-9,1-8");
|
|
|
|
|
check_ulist(v, expect1, ARRAY_SIZE(expect1));
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "32767,-32768--32767");
|
|
|
|
|
check_ulist(v, expect2, ARRAY_SIZE(expect2));
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data,
|
|
|
|
|
"-9223372036854775808,9223372036854775807");
|
|
|
|
|
check_ulist(v, expect3, ARRAY_SIZE(expect3));
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "1-1");
|
|
|
|
|
check_ulist(v, expect4, ARRAY_SIZE(expect4));
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "18446744073709551615");
|
|
|
|
|
check_ulist(v, expect5, ARRAY_SIZE(expect5));
|
|
|
|
|
|
2018-11-22 00:44:21 +08:00
|
|
|
v = visitor_input_test_init(data,
|
|
|
|
|
"18446744073709551613-18446744073709551615");
|
|
|
|
|
check_ulist(v, expect6, ARRAY_SIZE(expect6));
|
|
|
|
|
|
2018-11-22 00:44:20 +08:00
|
|
|
/* Value too large */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "18446744073709551616");
|
|
|
|
|
visit_type_uint64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Value too small */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "-18446744073709551616");
|
|
|
|
|
visit_type_uint64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Range not ascending */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "3-1");
|
|
|
|
|
visit_type_uint64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "18446744073709551615-0");
|
|
|
|
|
visit_type_uint64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Range too big (65536 is the limit against DOS attacks) */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "0-65536");
|
|
|
|
|
visit_type_uint64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Empty list */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "");
|
|
|
|
|
visit_type_uint64List(v, NULL, &res, &error_abort);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Not a list */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "not an uint list");
|
|
|
|
|
|
|
|
|
|
visit_type_uint64List(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
g_assert(!res);
|
|
|
|
|
|
|
|
|
|
/* Unvisited list tail */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "0,2-3");
|
|
|
|
|
|
|
|
|
|
visit_start_list(v, NULL, NULL, 0, &error_abort);
|
|
|
|
|
visit_type_uint64(v, NULL, &val, &error_abort);
|
|
|
|
|
g_assert_cmpuint(val, ==, 0);
|
|
|
|
|
visit_type_uint64(v, NULL, &val, &error_abort);
|
|
|
|
|
g_assert_cmpuint(val, ==, 2);
|
|
|
|
|
|
|
|
|
|
visit_check_list(v, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
visit_end_list(v, NULL);
|
|
|
|
|
|
|
|
|
|
/* Visit beyond end of list */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "0");
|
|
|
|
|
|
|
|
|
|
visit_start_list(v, NULL, NULL, 0, &error_abort);
|
|
|
|
|
visit_type_uint64(v, NULL, &val, &err);
|
|
|
|
|
g_assert_cmpuint(val, ==, 0);
|
|
|
|
|
visit_type_uint64(v, NULL, &val, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
|
|
|
|
|
visit_check_list(v, &error_abort);
|
|
|
|
|
visit_end_list(v, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-09 18:21:03 +08:00
|
|
|
static void test_visitor_in_bool(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
|
|
|
|
bool res = false;
|
|
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "true");
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_bool(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpint(res, ==, true);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "yes");
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_bool(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpint(res, ==, true);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "on");
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_bool(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpint(res, ==, true);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "false");
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_bool(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpint(res, ==, false);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "no");
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_bool(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpint(res, ==, false);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "off");
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_bool(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpint(res, ==, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void test_visitor_in_number(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
|
|
|
|
double res = 0, value = 3.14;
|
2014-05-02 19:26:29 +08:00
|
|
|
Error *err = NULL;
|
2012-02-09 18:21:03 +08:00
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "3.14");
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_number(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpfloat(res, ==, value);
|
2018-11-22 00:44:15 +08:00
|
|
|
|
|
|
|
|
/* NaN and infinity has to be rejected */
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "NaN");
|
|
|
|
|
|
|
|
|
|
visit_type_number(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "inf");
|
|
|
|
|
|
|
|
|
|
visit_type_number(v, NULL, &res, &err);
|
|
|
|
|
error_free_or_abort(&err);
|
|
|
|
|
|
2012-02-09 18:21:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void test_visitor_in_string(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
|
|
|
|
char *res = NULL, *value = (char *) "Q E M U";
|
|
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, value);
|
|
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_str(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpstr(res, ==, value);
|
|
|
|
|
|
|
|
|
|
g_free(res);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void test_visitor_in_enum(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
|
|
|
|
Visitor *v;
|
|
|
|
|
EnumOne i;
|
|
|
|
|
|
2017-08-24 16:46:06 +08:00
|
|
|
for (i = 0; i < ENUM_ONE__MAX; i++) {
|
2012-02-09 18:21:03 +08:00
|
|
|
EnumOne res = -1;
|
|
|
|
|
|
2017-08-24 16:46:08 +08:00
|
|
|
v = visitor_input_test_init(data, EnumOne_str(i));
|
2012-02-09 18:21:03 +08:00
|
|
|
|
2020-06-30 17:03:29 +08:00
|
|
|
visit_type_EnumOne(v, NULL, &res, &error_abort);
|
2012-02-09 18:21:03 +08:00
|
|
|
g_assert_cmpint(i, ==, res);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-19 23:43:53 +08:00
|
|
|
/* Try to crash the visitors */
|
|
|
|
|
static void test_visitor_in_fuzz(TestInputVisitorData *data,
|
|
|
|
|
const void *unused)
|
|
|
|
|
{
|
|
|
|
|
int64_t ires;
|
2014-06-10 19:15:27 +08:00
|
|
|
intList *ilres;
|
2013-01-19 23:43:53 +08:00
|
|
|
bool bres;
|
|
|
|
|
double nres;
|
|
|
|
|
char *sres;
|
|
|
|
|
EnumOne eres;
|
|
|
|
|
Visitor *v;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
char buf[10000];
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 100; i++) {
|
2019-07-31 00:01:37 +08:00
|
|
|
unsigned int j, k;
|
2013-01-19 23:43:53 +08:00
|
|
|
|
|
|
|
|
j = g_test_rand_int_range(0, sizeof(buf) - 1);
|
|
|
|
|
|
|
|
|
|
buf[j] = '\0';
|
|
|
|
|
|
2019-07-31 00:01:37 +08:00
|
|
|
for (k = 0; k != j; k++) {
|
|
|
|
|
buf[k] = (char)g_test_rand_int_range(0, 256);
|
2013-01-19 23:43:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, buf);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:54 +08:00
|
|
|
visit_type_int(v, NULL, &ires, NULL);
|
2013-01-19 23:43:53 +08:00
|
|
|
|
2014-06-10 19:15:27 +08:00
|
|
|
v = visitor_input_test_init(data, buf);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:54 +08:00
|
|
|
visit_type_intList(v, NULL, &ilres, NULL);
|
2016-07-12 22:08:47 +08:00
|
|
|
qapi_free_intList(ilres);
|
2014-06-10 19:15:27 +08:00
|
|
|
|
2013-01-19 23:43:53 +08:00
|
|
|
v = visitor_input_test_init(data, buf);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:54 +08:00
|
|
|
visit_type_bool(v, NULL, &bres, NULL);
|
2013-01-19 23:43:53 +08:00
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, buf);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:54 +08:00
|
|
|
visit_type_number(v, NULL, &nres, NULL);
|
2013-01-19 23:43:53 +08:00
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, buf);
|
2013-02-06 04:44:23 +08:00
|
|
|
sres = NULL;
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:54 +08:00
|
|
|
visit_type_str(v, NULL, &sres, NULL);
|
2013-01-19 23:43:53 +08:00
|
|
|
g_free(sres);
|
|
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, buf);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 21:48:54 +08:00
|
|
|
visit_type_EnumOne(v, NULL, &eres, NULL);
|
2013-01-19 23:43:53 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-09 18:21:03 +08:00
|
|
|
static void input_visitor_test_add(const char *testpath,
|
|
|
|
|
TestInputVisitorData *data,
|
|
|
|
|
void (*test_func)(TestInputVisitorData *data, const void *user_data))
|
|
|
|
|
{
|
|
|
|
|
g_test_add(testpath, TestInputVisitorData, data, NULL, test_func,
|
|
|
|
|
visitor_input_teardown);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
|
{
|
|
|
|
|
TestInputVisitorData in_visitor_data;
|
|
|
|
|
|
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
|
|
|
|
|
|
input_visitor_test_add("/string-visitor/input/int",
|
|
|
|
|
&in_visitor_data, test_visitor_in_int);
|
2014-06-10 19:15:27 +08:00
|
|
|
input_visitor_test_add("/string-visitor/input/intList",
|
|
|
|
|
&in_visitor_data, test_visitor_in_intList);
|
2018-11-22 00:44:20 +08:00
|
|
|
input_visitor_test_add("/string-visitor/input/uintList",
|
|
|
|
|
&in_visitor_data, test_visitor_in_uintList);
|
2012-02-09 18:21:03 +08:00
|
|
|
input_visitor_test_add("/string-visitor/input/bool",
|
|
|
|
|
&in_visitor_data, test_visitor_in_bool);
|
|
|
|
|
input_visitor_test_add("/string-visitor/input/number",
|
|
|
|
|
&in_visitor_data, test_visitor_in_number);
|
|
|
|
|
input_visitor_test_add("/string-visitor/input/string",
|
|
|
|
|
&in_visitor_data, test_visitor_in_string);
|
|
|
|
|
input_visitor_test_add("/string-visitor/input/enum",
|
|
|
|
|
&in_visitor_data, test_visitor_in_enum);
|
2013-01-19 23:43:53 +08:00
|
|
|
input_visitor_test_add("/string-visitor/input/fuzz",
|
|
|
|
|
&in_visitor_data, test_visitor_in_fuzz);
|
2012-02-09 18:21:03 +08:00
|
|
|
|
|
|
|
|
g_test_run();
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|