2011-07-20 03:50:45 +08:00
|
|
|
#include <glib.h>
|
2012-12-06 18:22:34 +08:00
|
|
|
#include "qemu-common.h"
|
2012-12-18 01:19:43 +08:00
|
|
|
#include "qapi/qmp/types.h"
|
2011-07-20 03:50:45 +08:00
|
|
|
#include "test-qmp-commands.h"
|
2012-12-18 01:19:43 +08:00
|
|
|
#include "qapi/qmp/dispatch.h"
|
2012-12-18 01:20:00 +08:00
|
|
|
#include "qemu/module.h"
|
2012-07-17 22:17:05 +08:00
|
|
|
#include "qapi/qmp-input-visitor.h"
|
|
|
|
#include "tests/test-qapi-types.h"
|
|
|
|
#include "tests/test-qapi-visit.h"
|
2011-07-20 03:50:45 +08:00
|
|
|
|
|
|
|
void qmp_user_def_cmd(Error **errp)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void qmp_user_def_cmd1(UserDefOne * ud1, Error **errp)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-03-01 15:40:28 +08:00
|
|
|
UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a,
|
|
|
|
bool has_udb1, UserDefOne *ud1b,
|
|
|
|
Error **errp)
|
2011-07-20 03:50:45 +08:00
|
|
|
{
|
|
|
|
UserDefTwo *ret;
|
2011-08-21 11:09:37 +08:00
|
|
|
UserDefOne *ud1c = g_malloc0(sizeof(UserDefOne));
|
|
|
|
UserDefOne *ud1d = g_malloc0(sizeof(UserDefOne));
|
2011-07-20 03:50:45 +08:00
|
|
|
|
|
|
|
ud1c->string = strdup(ud1a->string);
|
2014-03-01 15:40:31 +08:00
|
|
|
ud1c->base = g_new0(UserDefZero, 1);
|
|
|
|
ud1c->base->integer = ud1a->base->integer;
|
2014-03-01 15:40:28 +08:00
|
|
|
ud1d->string = strdup(has_udb1 ? ud1b->string : "blah0");
|
2014-03-01 15:40:31 +08:00
|
|
|
ud1d->base = g_new0(UserDefZero, 1);
|
|
|
|
ud1d->base->integer = has_udb1 ? ud1b->base->integer : 0;
|
2011-07-20 03:50:45 +08:00
|
|
|
|
2015-05-04 23:05:29 +08:00
|
|
|
ret = g_new0(UserDefTwo, 1);
|
|
|
|
ret->string0 = strdup("blah1");
|
qapi: Drop tests for inline nested structs
A future patch will be using a 'name':{dictionary} entry in the
QAPI schema to specify a default value for an optional argument;
but existing use of inline nested structs conflicts with that goal.
More precisely, a definition in the QAPI schema associates a name
with a set of properties:
Example 1: { 'struct': 'Foo', 'data': { MEMBERS... } }
associates the global name 'Foo' with properties (meta-type struct)
and MEMBERS...
Example 2: 'mumble': TYPE
within MEMBERS... above associates 'mumble' with properties (type
TYPE) and (optional false) within type Foo
The syntax of example 1 is extensible; if we need another property,
we add another name/value pair to the dictionary (such as
'base':TYPE). The syntax of example 2 is not extensible, because
the right hand side can only be a type.
We have used name encoding to add a property: "'*mumble': 'int'"
associates 'mumble' with (type int) and (optional true). Nice,
but doesn't scale. So the solution is to change our existing uses
to be syntactic sugar to an extensible form:
NAME: TYPE --> NAME: { 'type': TYPE, 'optional': false }
*ONAME: TYPE --> ONAME: { 'type': TYPE, 'optional': true }
This patch fixes the testsuite to avoid inline nested types, by
breaking the nesting into explicit types; it means that the type
is now boxed instead of unboxed in C code, but makes no difference
on the wire (and if desired, a later patch could change the
generator to not do so much boxing in C). When touching code to
add new allocations, also convert existing allocations to
consistently prefer typesafe g_new0 over g_malloc0 when a type
name is involved.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-05-04 23:05:30 +08:00
|
|
|
ret->dict1 = g_new0(UserDefTwoDict, 1);
|
|
|
|
ret->dict1->string1 = strdup("blah2");
|
|
|
|
ret->dict1->dict2 = g_new0(UserDefTwoDictDict, 1);
|
|
|
|
ret->dict1->dict2->userdef = ud1c;
|
|
|
|
ret->dict1->dict2->string = strdup("blah3");
|
|
|
|
ret->dict1->dict3 = g_new0(UserDefTwoDictDict, 1);
|
|
|
|
ret->dict1->has_dict3 = true;
|
|
|
|
ret->dict1->dict3->userdef = ud1d;
|
|
|
|
ret->dict1->dict3->string = strdup("blah4");
|
2011-07-20 03:50:45 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-03-01 15:40:29 +08:00
|
|
|
int64_t qmp_user_def_cmd3(int64_t a, bool has_b, int64_t b, Error **errp)
|
|
|
|
{
|
|
|
|
return a + (has_b ? b : 0);
|
|
|
|
}
|
|
|
|
|
2015-05-14 20:51:01 +08:00
|
|
|
__org_qemu_x_Union1 *qmp___org_qemu_x_command(__org_qemu_x_EnumList *a,
|
|
|
|
__org_qemu_x_StructList *b,
|
|
|
|
__org_qemu_x_Union2 *c,
|
|
|
|
__org_qemu_x_Alt *d,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
__org_qemu_x_Union1 *ret = g_new0(__org_qemu_x_Union1, 1);
|
|
|
|
|
|
|
|
ret->kind = ORG_QEMU_X_UNION1_KIND___ORG_QEMU_X_BRANCH;
|
|
|
|
ret->__org_qemu_x_branch = strdup("blah1");
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-07-20 03:50:45 +08:00
|
|
|
/* test commands with no input and no return value */
|
|
|
|
static void test_dispatch_cmd(void)
|
|
|
|
{
|
|
|
|
QDict *req = qdict_new();
|
|
|
|
QObject *resp;
|
|
|
|
|
|
|
|
qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd")));
|
|
|
|
|
|
|
|
resp = qmp_dispatch(QOBJECT(req));
|
|
|
|
assert(resp != NULL);
|
|
|
|
assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
|
|
|
|
|
|
|
|
qobject_decref(resp);
|
|
|
|
QDECREF(req);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* test commands that return an error due to invalid parameters */
|
|
|
|
static void test_dispatch_cmd_error(void)
|
|
|
|
{
|
|
|
|
QDict *req = qdict_new();
|
|
|
|
QObject *resp;
|
|
|
|
|
|
|
|
qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2")));
|
|
|
|
|
|
|
|
resp = qmp_dispatch(QOBJECT(req));
|
|
|
|
assert(resp != NULL);
|
|
|
|
assert(qdict_haskey(qobject_to_qdict(resp), "error"));
|
|
|
|
|
|
|
|
qobject_decref(resp);
|
|
|
|
QDECREF(req);
|
|
|
|
}
|
|
|
|
|
2014-03-01 15:40:27 +08:00
|
|
|
static QObject *test_qmp_dispatch(QDict *req)
|
|
|
|
{
|
|
|
|
QObject *resp_obj;
|
|
|
|
QDict *resp;
|
|
|
|
QObject *ret;
|
|
|
|
|
|
|
|
resp_obj = qmp_dispatch(QOBJECT(req));
|
|
|
|
assert(resp_obj);
|
|
|
|
resp = qobject_to_qdict(resp_obj);
|
|
|
|
assert(resp && !qdict_haskey(resp, "error"));
|
|
|
|
ret = qdict_get(resp, "return");
|
|
|
|
assert(ret);
|
|
|
|
qobject_incref(ret);
|
|
|
|
qobject_decref(resp_obj);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-07-20 03:50:45 +08:00
|
|
|
/* test commands that involve both input parameters and return values */
|
|
|
|
static void test_dispatch_cmd_io(void)
|
|
|
|
{
|
|
|
|
QDict *req = qdict_new();
|
|
|
|
QDict *args = qdict_new();
|
2014-03-01 15:40:29 +08:00
|
|
|
QDict *args3 = qdict_new();
|
2011-07-20 03:50:45 +08:00
|
|
|
QDict *ud1a = qdict_new();
|
|
|
|
QDict *ud1b = qdict_new();
|
2014-03-01 15:40:27 +08:00
|
|
|
QDict *ret, *ret_dict, *ret_dict_dict, *ret_dict_dict_userdef;
|
|
|
|
QDict *ret_dict_dict2, *ret_dict_dict2_userdef;
|
2014-03-01 15:40:29 +08:00
|
|
|
QInt *ret3;
|
2011-07-20 03:50:45 +08:00
|
|
|
|
|
|
|
qdict_put_obj(ud1a, "integer", QOBJECT(qint_from_int(42)));
|
|
|
|
qdict_put_obj(ud1a, "string", QOBJECT(qstring_from_str("hello")));
|
|
|
|
qdict_put_obj(ud1b, "integer", QOBJECT(qint_from_int(422)));
|
|
|
|
qdict_put_obj(ud1b, "string", QOBJECT(qstring_from_str("hello2")));
|
|
|
|
qdict_put_obj(args, "ud1a", QOBJECT(ud1a));
|
|
|
|
qdict_put_obj(args, "ud1b", QOBJECT(ud1b));
|
|
|
|
qdict_put_obj(req, "arguments", QOBJECT(args));
|
|
|
|
qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2")));
|
|
|
|
|
2014-03-01 15:40:27 +08:00
|
|
|
ret = qobject_to_qdict(test_qmp_dispatch(req));
|
|
|
|
|
2015-05-04 23:05:29 +08:00
|
|
|
assert(!strcmp(qdict_get_str(ret, "string0"), "blah1"));
|
|
|
|
ret_dict = qdict_get_qdict(ret, "dict1");
|
|
|
|
assert(!strcmp(qdict_get_str(ret_dict, "string1"), "blah2"));
|
|
|
|
ret_dict_dict = qdict_get_qdict(ret_dict, "dict2");
|
2014-03-01 15:40:27 +08:00
|
|
|
ret_dict_dict_userdef = qdict_get_qdict(ret_dict_dict, "userdef");
|
|
|
|
assert(qdict_get_int(ret_dict_dict_userdef, "integer") == 42);
|
|
|
|
assert(!strcmp(qdict_get_str(ret_dict_dict_userdef, "string"), "hello"));
|
|
|
|
assert(!strcmp(qdict_get_str(ret_dict_dict, "string"), "blah3"));
|
2015-05-04 23:05:29 +08:00
|
|
|
ret_dict_dict2 = qdict_get_qdict(ret_dict, "dict3");
|
2014-03-01 15:40:27 +08:00
|
|
|
ret_dict_dict2_userdef = qdict_get_qdict(ret_dict_dict2, "userdef");
|
|
|
|
assert(qdict_get_int(ret_dict_dict2_userdef, "integer") == 422);
|
|
|
|
assert(!strcmp(qdict_get_str(ret_dict_dict2_userdef, "string"), "hello2"));
|
|
|
|
assert(!strcmp(qdict_get_str(ret_dict_dict2, "string"), "blah4"));
|
|
|
|
QDECREF(ret);
|
2014-03-01 15:40:29 +08:00
|
|
|
|
|
|
|
qdict_put(args3, "a", qint_from_int(66));
|
|
|
|
qdict_put(req, "arguments", args3);
|
|
|
|
qdict_put(req, "execute", qstring_from_str("user_def_cmd3"));
|
|
|
|
|
|
|
|
ret3 = qobject_to_qint(test_qmp_dispatch(req));
|
|
|
|
assert(qint_get_int(ret3) == 66);
|
2014-03-09 01:20:06 +08:00
|
|
|
QDECREF(ret3);
|
2014-03-01 15:40:29 +08:00
|
|
|
|
2011-07-20 03:50:45 +08:00
|
|
|
QDECREF(req);
|
|
|
|
}
|
|
|
|
|
2011-09-16 03:39:54 +08:00
|
|
|
/* test generated dealloc functions for generated types */
|
|
|
|
static void test_dealloc_types(void)
|
|
|
|
{
|
|
|
|
UserDefOne *ud1test, *ud1a, *ud1b;
|
|
|
|
UserDefOneList *ud1list;
|
|
|
|
|
|
|
|
ud1test = g_malloc0(sizeof(UserDefOne));
|
2014-03-01 15:40:31 +08:00
|
|
|
ud1test->base = g_new0(UserDefZero, 1);
|
|
|
|
ud1test->base->integer = 42;
|
2011-09-16 03:39:54 +08:00
|
|
|
ud1test->string = g_strdup("hi there 42");
|
|
|
|
|
|
|
|
qapi_free_UserDefOne(ud1test);
|
|
|
|
|
|
|
|
ud1a = g_malloc0(sizeof(UserDefOne));
|
2014-03-01 15:40:31 +08:00
|
|
|
ud1a->base = g_new0(UserDefZero, 1);
|
|
|
|
ud1a->base->integer = 43;
|
2011-09-16 03:39:54 +08:00
|
|
|
ud1a->string = g_strdup("hi there 43");
|
|
|
|
|
|
|
|
ud1b = g_malloc0(sizeof(UserDefOne));
|
2014-03-01 15:40:31 +08:00
|
|
|
ud1b->base = g_new0(UserDefZero, 1);
|
|
|
|
ud1b->base->integer = 44;
|
2011-09-16 03:39:54 +08:00
|
|
|
ud1b->string = g_strdup("hi there 44");
|
|
|
|
|
|
|
|
ud1list = g_malloc0(sizeof(UserDefOneList));
|
|
|
|
ud1list->value = ud1a;
|
|
|
|
ud1list->next = g_malloc0(sizeof(UserDefOneList));
|
|
|
|
ud1list->next->value = ud1b;
|
|
|
|
|
|
|
|
qapi_free_UserDefOneList(ud1list);
|
|
|
|
}
|
|
|
|
|
2012-07-17 22:17:05 +08:00
|
|
|
/* test generated deallocation on an object whose construction was prematurely
|
|
|
|
* terminated due to an error */
|
|
|
|
static void test_dealloc_partial(void)
|
|
|
|
{
|
|
|
|
static const char text[] = "don't leak me";
|
|
|
|
|
|
|
|
UserDefTwo *ud2 = NULL;
|
|
|
|
Error *err = NULL;
|
|
|
|
|
|
|
|
/* create partial object */
|
|
|
|
{
|
|
|
|
QDict *ud2_dict;
|
|
|
|
QmpInputVisitor *qiv;
|
|
|
|
|
|
|
|
ud2_dict = qdict_new();
|
2015-05-04 23:05:29 +08:00
|
|
|
qdict_put_obj(ud2_dict, "string0", QOBJECT(qstring_from_str(text)));
|
2012-07-17 22:17:05 +08:00
|
|
|
|
|
|
|
qiv = qmp_input_visitor_new(QOBJECT(ud2_dict));
|
|
|
|
visit_type_UserDefTwo(qmp_input_get_visitor(qiv), &ud2, NULL, &err);
|
|
|
|
qmp_input_visitor_cleanup(qiv);
|
|
|
|
QDECREF(ud2_dict);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* verify partial success */
|
|
|
|
assert(ud2 != NULL);
|
2015-05-04 23:05:29 +08:00
|
|
|
assert(ud2->string0 != NULL);
|
|
|
|
assert(strcmp(ud2->string0, text) == 0);
|
qapi: Drop tests for inline nested structs
A future patch will be using a 'name':{dictionary} entry in the
QAPI schema to specify a default value for an optional argument;
but existing use of inline nested structs conflicts with that goal.
More precisely, a definition in the QAPI schema associates a name
with a set of properties:
Example 1: { 'struct': 'Foo', 'data': { MEMBERS... } }
associates the global name 'Foo' with properties (meta-type struct)
and MEMBERS...
Example 2: 'mumble': TYPE
within MEMBERS... above associates 'mumble' with properties (type
TYPE) and (optional false) within type Foo
The syntax of example 1 is extensible; if we need another property,
we add another name/value pair to the dictionary (such as
'base':TYPE). The syntax of example 2 is not extensible, because
the right hand side can only be a type.
We have used name encoding to add a property: "'*mumble': 'int'"
associates 'mumble' with (type int) and (optional true). Nice,
but doesn't scale. So the solution is to change our existing uses
to be syntactic sugar to an extensible form:
NAME: TYPE --> NAME: { 'type': TYPE, 'optional': false }
*ONAME: TYPE --> ONAME: { 'type': TYPE, 'optional': true }
This patch fixes the testsuite to avoid inline nested types, by
breaking the nesting into explicit types; it means that the type
is now boxed instead of unboxed in C code, but makes no difference
on the wire (and if desired, a later patch could change the
generator to not do so much boxing in C). When touching code to
add new allocations, also convert existing allocations to
consistently prefer typesafe g_new0 over g_malloc0 when a type
name is involved.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-05-04 23:05:30 +08:00
|
|
|
assert(ud2->dict1 == NULL);
|
2012-07-17 22:17:05 +08:00
|
|
|
|
|
|
|
/* confirm & release construction error */
|
|
|
|
assert(err != NULL);
|
|
|
|
error_free(err);
|
|
|
|
|
|
|
|
/* tear down partial object */
|
|
|
|
qapi_free_UserDefTwo(ud2);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-07-20 03:50:45 +08:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
|
|
|
|
g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd);
|
|
|
|
g_test_add_func("/0.15/dispatch_cmd_error", test_dispatch_cmd_error);
|
|
|
|
g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io);
|
2011-09-16 03:39:54 +08:00
|
|
|
g_test_add_func("/0.15/dealloc_types", test_dealloc_types);
|
2012-07-17 22:17:05 +08:00
|
|
|
g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial);
|
2011-07-20 03:50:45 +08:00
|
|
|
|
|
|
|
module_call_init(MODULE_INIT_QAPI);
|
|
|
|
g_test_run();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|