2016-02-08 21:08:51 +03:00
|
|
|
#include "qemu/osdep.h"
|
2012-12-06 14:22:34 +04:00
|
|
|
#include "qemu-common.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp/types.h"
|
2011-07-19 23:50:45 +04:00
|
|
|
#include "test-qmp-commands.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp/dispatch.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/module.h"
|
2012-07-17 18:17:05 +04:00
|
|
|
#include "qapi/qmp-input-visitor.h"
|
|
|
|
#include "tests/test-qapi-types.h"
|
|
|
|
#include "tests/test-qapi-visit.h"
|
2011-07-19 23:50:45 +04:00
|
|
|
|
|
|
|
void qmp_user_def_cmd(Error **errp)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-03-18 01:48:27 +03:00
|
|
|
Empty2 *qmp_user_def_cmd0(Error **errp)
|
|
|
|
{
|
|
|
|
return g_new0(Empty2, 1);
|
|
|
|
}
|
|
|
|
|
2011-07-19 23:50:45 +04:00
|
|
|
void qmp_user_def_cmd1(UserDefOne * ud1, Error **errp)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-03-01 11:40:28 +04:00
|
|
|
UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a,
|
|
|
|
bool has_udb1, UserDefOne *ud1b,
|
|
|
|
Error **errp)
|
2011-07-19 23:50:45 +04:00
|
|
|
{
|
|
|
|
UserDefTwo *ret;
|
2011-08-21 07:09:37 +04:00
|
|
|
UserDefOne *ud1c = g_malloc0(sizeof(UserDefOne));
|
|
|
|
UserDefOne *ud1d = g_malloc0(sizeof(UserDefOne));
|
2011-07-19 23:50:45 +04:00
|
|
|
|
|
|
|
ud1c->string = strdup(ud1a->string);
|
qapi: Unbox base members
Rather than storing a base class as a pointer to a box, just
store the fields of that base class in the same order, so that
a child struct can be directly cast to its parent. This gives
less malloc overhead, less pointer dereferencing, and even less
generated code. Compare to the earlier commit 1e6c1616a "qapi:
Generate a nicer struct for flat unions" (although that patch
had fewer places to change, as less of qemu was directly using
qapi structs for flat unions). It also allows us to turn on
automatic type-safe wrappers for upcasting to the base class
of a struct.
Changes to the generated code look like this in qapi-types.h:
| struct SpiceChannel {
|- SpiceBasicInfo *base;
|+ /* Members inherited from SpiceBasicInfo: */
|+ char *host;
|+ char *port;
|+ NetworkAddressFamily family;
|+ /* Own members: */
| int64_t connection_id;
as well as additional upcast functions like qapi_SpiceChannel_base().
Meanwhile, changes to qapi-visit.c look like:
| static void visit_type_SpiceChannel_fields(Visitor *v, SpiceChannel **obj, Error **errp)
| {
| Error *err = NULL;
|
|- visit_type_implicit_SpiceBasicInfo(v, &(*obj)->base, &err);
|+ visit_type_SpiceBasicInfo_fields(v, (SpiceBasicInfo **)obj, &err);
| if (err) {
(the cast is necessary, since our upcast wrappers only deal with a
single pointer, not pointer-to-pointer); plus the wholesale
elimination of some now-unused visit_type_implicit_FOO() functions.
Without boxing, the corner case of one empty struct having
another empty struct as its base type now requires inserting a
dummy member (previously, the 'Base *base' member sufficed).
And now that we no longer consume a 'base' member in the generated
C struct, we can delete the former negative struct-base-clash-base
test.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-11-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:49 +03:00
|
|
|
ud1c->integer = ud1a->integer;
|
2014-03-01 11:40:28 +04:00
|
|
|
ud1d->string = strdup(has_udb1 ? ud1b->string : "blah0");
|
qapi: Unbox base members
Rather than storing a base class as a pointer to a box, just
store the fields of that base class in the same order, so that
a child struct can be directly cast to its parent. This gives
less malloc overhead, less pointer dereferencing, and even less
generated code. Compare to the earlier commit 1e6c1616a "qapi:
Generate a nicer struct for flat unions" (although that patch
had fewer places to change, as less of qemu was directly using
qapi structs for flat unions). It also allows us to turn on
automatic type-safe wrappers for upcasting to the base class
of a struct.
Changes to the generated code look like this in qapi-types.h:
| struct SpiceChannel {
|- SpiceBasicInfo *base;
|+ /* Members inherited from SpiceBasicInfo: */
|+ char *host;
|+ char *port;
|+ NetworkAddressFamily family;
|+ /* Own members: */
| int64_t connection_id;
as well as additional upcast functions like qapi_SpiceChannel_base().
Meanwhile, changes to qapi-visit.c look like:
| static void visit_type_SpiceChannel_fields(Visitor *v, SpiceChannel **obj, Error **errp)
| {
| Error *err = NULL;
|
|- visit_type_implicit_SpiceBasicInfo(v, &(*obj)->base, &err);
|+ visit_type_SpiceBasicInfo_fields(v, (SpiceBasicInfo **)obj, &err);
| if (err) {
(the cast is necessary, since our upcast wrappers only deal with a
single pointer, not pointer-to-pointer); plus the wholesale
elimination of some now-unused visit_type_implicit_FOO() functions.
Without boxing, the corner case of one empty struct having
another empty struct as its base type now requires inserting a
dummy member (previously, the 'Base *base' member sufficed).
And now that we no longer consume a 'base' member in the generated
C struct, we can delete the former negative struct-base-clash-base
test.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-11-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:49 +03:00
|
|
|
ud1d->integer = has_udb1 ? ud1b->integer : 0;
|
2011-07-19 23:50:45 +04:00
|
|
|
|
2015-05-04 18:05:29 +03: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 18:05:30 +03: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-19 23:50:45 +04:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-10-13 07:22:25 +03:00
|
|
|
int64_t qmp_guest_get_time(int64_t a, bool has_b, int64_t b, Error **errp)
|
2014-03-01 11:40:29 +04:00
|
|
|
{
|
|
|
|
return a + (has_b ? b : 0);
|
|
|
|
}
|
|
|
|
|
2015-09-16 14:06:24 +03:00
|
|
|
QObject *qmp_guest_sync(QObject *arg, Error **errp)
|
|
|
|
{
|
|
|
|
return arg;
|
|
|
|
}
|
|
|
|
|
2015-05-14 15:51:01 +03: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);
|
|
|
|
|
2015-10-27 01:34:53 +03:00
|
|
|
ret->type = ORG_QEMU_X_UNION1_KIND___ORG_QEMU_X_BRANCH;
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-18 01:48:37 +03:00
|
|
|
ret->u.__org_qemu_x_branch.data = strdup("blah1");
|
2015-05-14 15:51:01 +03:00
|
|
|
|
2015-11-18 11:52:52 +03:00
|
|
|
/* Also test that 'wchar-t' was munged to 'q_wchar_t' */
|
|
|
|
if (b && b->value && !b->value->has_q_wchar_t) {
|
|
|
|
b->value->q_wchar_t = 1;
|
|
|
|
}
|
2015-05-14 15:51:01 +03:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-07-19 23:50:45 +04: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 11:40:27 +04: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-19 23:50:45 +04: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 11:40:29 +04:00
|
|
|
QDict *args3 = qdict_new();
|
2011-07-19 23:50:45 +04:00
|
|
|
QDict *ud1a = qdict_new();
|
|
|
|
QDict *ud1b = qdict_new();
|
2014-03-01 11:40:27 +04:00
|
|
|
QDict *ret, *ret_dict, *ret_dict_dict, *ret_dict_dict_userdef;
|
|
|
|
QDict *ret_dict_dict2, *ret_dict_dict2_userdef;
|
2014-03-01 11:40:29 +04:00
|
|
|
QInt *ret3;
|
2011-07-19 23:50:45 +04: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 11:40:27 +04:00
|
|
|
ret = qobject_to_qdict(test_qmp_dispatch(req));
|
|
|
|
|
2015-05-04 18:05:29 +03: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 11:40:27 +04: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 18:05:29 +03:00
|
|
|
ret_dict_dict2 = qdict_get_qdict(ret_dict, "dict3");
|
2014-03-01 11:40:27 +04: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 11:40:29 +04:00
|
|
|
|
|
|
|
qdict_put(args3, "a", qint_from_int(66));
|
|
|
|
qdict_put(req, "arguments", args3);
|
2015-10-13 07:22:25 +03:00
|
|
|
qdict_put(req, "execute", qstring_from_str("guest-get-time"));
|
2014-03-01 11:40:29 +04:00
|
|
|
|
|
|
|
ret3 = qobject_to_qint(test_qmp_dispatch(req));
|
|
|
|
assert(qint_get_int(ret3) == 66);
|
2014-03-08 21:20:06 +04:00
|
|
|
QDECREF(ret3);
|
2014-03-01 11:40:29 +04:00
|
|
|
|
2011-07-19 23:50:45 +04:00
|
|
|
QDECREF(req);
|
|
|
|
}
|
|
|
|
|
2011-09-15 23:39:54 +04: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));
|
qapi: Unbox base members
Rather than storing a base class as a pointer to a box, just
store the fields of that base class in the same order, so that
a child struct can be directly cast to its parent. This gives
less malloc overhead, less pointer dereferencing, and even less
generated code. Compare to the earlier commit 1e6c1616a "qapi:
Generate a nicer struct for flat unions" (although that patch
had fewer places to change, as less of qemu was directly using
qapi structs for flat unions). It also allows us to turn on
automatic type-safe wrappers for upcasting to the base class
of a struct.
Changes to the generated code look like this in qapi-types.h:
| struct SpiceChannel {
|- SpiceBasicInfo *base;
|+ /* Members inherited from SpiceBasicInfo: */
|+ char *host;
|+ char *port;
|+ NetworkAddressFamily family;
|+ /* Own members: */
| int64_t connection_id;
as well as additional upcast functions like qapi_SpiceChannel_base().
Meanwhile, changes to qapi-visit.c look like:
| static void visit_type_SpiceChannel_fields(Visitor *v, SpiceChannel **obj, Error **errp)
| {
| Error *err = NULL;
|
|- visit_type_implicit_SpiceBasicInfo(v, &(*obj)->base, &err);
|+ visit_type_SpiceBasicInfo_fields(v, (SpiceBasicInfo **)obj, &err);
| if (err) {
(the cast is necessary, since our upcast wrappers only deal with a
single pointer, not pointer-to-pointer); plus the wholesale
elimination of some now-unused visit_type_implicit_FOO() functions.
Without boxing, the corner case of one empty struct having
another empty struct as its base type now requires inserting a
dummy member (previously, the 'Base *base' member sufficed).
And now that we no longer consume a 'base' member in the generated
C struct, we can delete the former negative struct-base-clash-base
test.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-11-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:49 +03:00
|
|
|
ud1test->integer = 42;
|
2011-09-15 23:39:54 +04:00
|
|
|
ud1test->string = g_strdup("hi there 42");
|
|
|
|
|
|
|
|
qapi_free_UserDefOne(ud1test);
|
|
|
|
|
|
|
|
ud1a = g_malloc0(sizeof(UserDefOne));
|
qapi: Unbox base members
Rather than storing a base class as a pointer to a box, just
store the fields of that base class in the same order, so that
a child struct can be directly cast to its parent. This gives
less malloc overhead, less pointer dereferencing, and even less
generated code. Compare to the earlier commit 1e6c1616a "qapi:
Generate a nicer struct for flat unions" (although that patch
had fewer places to change, as less of qemu was directly using
qapi structs for flat unions). It also allows us to turn on
automatic type-safe wrappers for upcasting to the base class
of a struct.
Changes to the generated code look like this in qapi-types.h:
| struct SpiceChannel {
|- SpiceBasicInfo *base;
|+ /* Members inherited from SpiceBasicInfo: */
|+ char *host;
|+ char *port;
|+ NetworkAddressFamily family;
|+ /* Own members: */
| int64_t connection_id;
as well as additional upcast functions like qapi_SpiceChannel_base().
Meanwhile, changes to qapi-visit.c look like:
| static void visit_type_SpiceChannel_fields(Visitor *v, SpiceChannel **obj, Error **errp)
| {
| Error *err = NULL;
|
|- visit_type_implicit_SpiceBasicInfo(v, &(*obj)->base, &err);
|+ visit_type_SpiceBasicInfo_fields(v, (SpiceBasicInfo **)obj, &err);
| if (err) {
(the cast is necessary, since our upcast wrappers only deal with a
single pointer, not pointer-to-pointer); plus the wholesale
elimination of some now-unused visit_type_implicit_FOO() functions.
Without boxing, the corner case of one empty struct having
another empty struct as its base type now requires inserting a
dummy member (previously, the 'Base *base' member sufficed).
And now that we no longer consume a 'base' member in the generated
C struct, we can delete the former negative struct-base-clash-base
test.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-11-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:49 +03:00
|
|
|
ud1a->integer = 43;
|
2011-09-15 23:39:54 +04:00
|
|
|
ud1a->string = g_strdup("hi there 43");
|
|
|
|
|
|
|
|
ud1b = g_malloc0(sizeof(UserDefOne));
|
qapi: Unbox base members
Rather than storing a base class as a pointer to a box, just
store the fields of that base class in the same order, so that
a child struct can be directly cast to its parent. This gives
less malloc overhead, less pointer dereferencing, and even less
generated code. Compare to the earlier commit 1e6c1616a "qapi:
Generate a nicer struct for flat unions" (although that patch
had fewer places to change, as less of qemu was directly using
qapi structs for flat unions). It also allows us to turn on
automatic type-safe wrappers for upcasting to the base class
of a struct.
Changes to the generated code look like this in qapi-types.h:
| struct SpiceChannel {
|- SpiceBasicInfo *base;
|+ /* Members inherited from SpiceBasicInfo: */
|+ char *host;
|+ char *port;
|+ NetworkAddressFamily family;
|+ /* Own members: */
| int64_t connection_id;
as well as additional upcast functions like qapi_SpiceChannel_base().
Meanwhile, changes to qapi-visit.c look like:
| static void visit_type_SpiceChannel_fields(Visitor *v, SpiceChannel **obj, Error **errp)
| {
| Error *err = NULL;
|
|- visit_type_implicit_SpiceBasicInfo(v, &(*obj)->base, &err);
|+ visit_type_SpiceBasicInfo_fields(v, (SpiceBasicInfo **)obj, &err);
| if (err) {
(the cast is necessary, since our upcast wrappers only deal with a
single pointer, not pointer-to-pointer); plus the wholesale
elimination of some now-unused visit_type_implicit_FOO() functions.
Without boxing, the corner case of one empty struct having
another empty struct as its base type now requires inserting a
dummy member (previously, the 'Base *base' member sufficed).
And now that we no longer consume a 'base' member in the generated
C struct, we can delete the former negative struct-base-clash-base
test.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-11-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:49 +03:00
|
|
|
ud1b->integer = 44;
|
2011-09-15 23:39:54 +04: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 18:17:05 +04: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 18:05:29 +03:00
|
|
|
qdict_put_obj(ud2_dict, "string0", QOBJECT(qstring_from_str(text)));
|
2012-07-17 18:17:05 +04:00
|
|
|
|
qapi: Use strict QMP input visitor in more places
The following uses of a QMP input visitor should be strict
(that is, excess keys in QDict input should be flagged if not
converted to QAPI):
- Testsuite code unrelated to explicitly testing non-strict
mode (test-qmp-commands, test-visitor-serialization); since
we want more code to be strict by default, having more tests
of strict mode doesn't hurt
- Code used for cloning QAPI objects (replay-input.c,
qemu-sockets.c); we are reparsing a QObject just barely
produced by the qmp output visitor and which therefore should
not have any garbage, so while it is extra work to be strict,
it validates that our clone is correct [note that a later patch
series will simplify these two uses by creating an actual
clone visitor that is much more efficient than a
generate/reparse cycle]
- qmp_object_add(), which calls into user_creatable_add_type().
Since command line parsing for '-object' uses the same
user_creatable_add_type() through the OptsVisitor, and that is
always strict, we want to ensure that any nested dictionaries
would be treated the same in QMP and from the command line (I
don't actually know if such nested dictionaries exist). Note
that on this code change, strictness only matters for nested
dictionaries (if even possible), since we already flag excess
input at the top level during an earlier object_property_set()
on an unknown key, whether from QemuOpts:
$ ./x86_64-softmmu/qemu-system-x86_64 -nographic -nodefaults -qmp stdio -object secret,id=sec0,data=letmein,format=raw,foo=bar
qemu-system-x86_64: -object secret,id=sec0,data=letmein,format=raw,foo=bar: Property '.foo' not found
or from QMP:
$ ./x86_64-softmmu/qemu-system-x86_64 -nographic -nodefaults -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 93, "minor": 5, "major": 2}, "package": ""}, "capabilities": []}}
{"execute":"qmp_capabilities"}
{"return": {}}
{"execute":"object-add","arguments":{"qom-type":"secret","id":"sec0","props":{"format":"raw","data":"letmein","foo":"bar"}}}
{"error": {"class": "GenericError", "desc": "Property '.foo' not found"}}
The only remaining uses of non-strict input visits are:
- QMP 'qom-set' (which eventually executes
object_property_set_qobject()) - mark it as something to revisit
in the future (I didn't want to spend any more time on this patch
auditing if we have any QOM dictionary properties that might be
impacted, and couldn't easily prove whether this code path is
shared with anything else).
- test-qmp-input-visitor: explicit tests of non-strict mode. If
we later get rid of users that don't need strictness, then this
test should be merged with test-qmp-input-strict
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-7-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-04-29 00:45:14 +03:00
|
|
|
qiv = qmp_input_visitor_new(QOBJECT(ud2_dict), true);
|
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 16:48:54 +03:00
|
|
|
visit_type_UserDefTwo(qmp_input_get_visitor(qiv), NULL, &ud2, &err);
|
2012-07-17 18:17:05 +04:00
|
|
|
qmp_input_visitor_cleanup(qiv);
|
|
|
|
QDECREF(ud2_dict);
|
|
|
|
}
|
|
|
|
|
2016-04-29 00:45:32 +03:00
|
|
|
/* verify that visit_type_XXX() cleans up properly on error */
|
2015-11-06 09:35:31 +03:00
|
|
|
error_free_or_abort(&err);
|
2016-04-29 00:45:32 +03:00
|
|
|
assert(!ud2);
|
|
|
|
|
|
|
|
/* Manually create a partial object, leaving ud2->dict1 at NULL */
|
|
|
|
ud2 = g_new0(UserDefTwo, 1);
|
|
|
|
ud2->string0 = g_strdup(text);
|
2012-07-17 18:17:05 +04:00
|
|
|
|
|
|
|
/* tear down partial object */
|
|
|
|
qapi_free_UserDefTwo(ud2);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-07-19 23:50:45 +04: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-15 23:39:54 +04:00
|
|
|
g_test_add_func("/0.15/dealloc_types", test_dealloc_types);
|
2012-07-17 18:17:05 +04:00
|
|
|
g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial);
|
2011-07-19 23:50:45 +04:00
|
|
|
|
|
|
|
module_call_init(MODULE_INIT_QAPI);
|
|
|
|
g_test_run();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|