{"id":808771,"url":"http://patchwork.ozlabs.org/api/patches/808771/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-33-armbru@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901153758.8628-33-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:43","name":"[PULL,v2,32/47] qapi: Update qapi-code-gen.txt examples to match current code","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b3d6fbbffbc39c7669f8800aff2b5e5e611d41d4","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/?format=json","name":"Markus Armbruster","email":"armbru@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-33-armbru@redhat.com/mbox/","series":[{"id":1049,"url":"http://patchwork.ozlabs.org/api/series/1049/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1049","date":"2017-09-01T15:37:14","name":"[PULL,v2,01/47] qapi: Fix error handling code on alternate conflict","version":2,"mbox":"http://patchwork.ozlabs.org/series/1049/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808771/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808771/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkPFL1tTCz9sRV\n\tfor ;\n\tSat, 2 Sep 2017 02:04:22 +1000 (AEST)","from localhost ([::1]:46658 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoQe-0007ar-9k\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:04:20 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51686)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1S-0006i3-EO\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1L-0001iP-Ml\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:18 -0400","from mx1.redhat.com ([209.132.183.28]:53880)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1L-0001h1-75\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:11 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 2C6C14629B\n\tfor ; Fri, 1 Sep 2017 15:38:10 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com\n\t[10.36.116.75])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id C9C8260C2F\n\tfor ; Fri, 1 Sep 2017 15:38:09 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid A19211132F41; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2C6C14629B","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:43 +0200","Message-Id":"<20170901153758.8628-33-armbru@redhat.com>","In-Reply-To":"<20170901153758.8628-1-armbru@redhat.com>","References":"<20170901153758.8628-1-armbru@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tFri, 01 Sep 2017 15:38:10 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL v2 32/47] qapi: Update qapi-code-gen.txt\n\texamples to match current code","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Markus Armbruster \nMessage-Id: <1503564371-26090-2-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau \n---\n docs/devel/qapi-code-gen.txt | 47 +++++++++++++++++++++++++++++++++++---------\n 1 file changed, 38 insertions(+), 9 deletions(-)","diff":"diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt\nindex 9903ac4c19..ae05327869 100644\n--- a/docs/devel/qapi-code-gen.txt\n+++ b/docs/devel/qapi-code-gen.txt\n@@ -957,6 +957,8 @@ Example:\n \n typedef struct UserDefOneList UserDefOneList;\n \n+ typedef struct q_obj_my_command_arg q_obj_my_command_arg;\n+\n struct UserDefOne {\n int64_t integer;\n bool has_string;\n@@ -972,6 +974,10 @@ Example:\n \n void qapi_free_UserDefOneList(UserDefOneList *obj);\n \n+ struct q_obj_my_command_arg {\n+ UserDefOneList *arg1;\n+ };\n+\n #endif\n $ cat qapi-generated/example-qapi-types.c\n [Uninteresting stuff omitted...]\n@@ -1036,6 +1042,8 @@ Example:\n void visit_type_UserDefOne(Visitor *v, const char *name, UserDefOne **obj, Error **errp);\n void visit_type_UserDefOneList(Visitor *v, const char *name, UserDefOneList **obj, Error **errp);\n \n+ void visit_type_q_obj_my_command_arg_members(Visitor *v, q_obj_my_command_arg *obj, Error **errp);\n+\n #endif\n $ cat qapi-generated/example-qapi-visit.c\n [Uninteresting stuff omitted...]\n@@ -1104,6 +1112,9 @@ Example:\n }\n }\n \n+ if (!err) {\n+ visit_check_list(v, &err);\n+ }\n visit_end_list(v, (void **)obj);\n if (err && visit_is_input(v)) {\n qapi_free_UserDefOneList(*obj);\n@@ -1113,6 +1124,19 @@ Example:\n error_propagate(errp, err);\n }\n \n+ void visit_type_q_obj_my_command_arg_members(Visitor *v, q_obj_my_command_arg *obj, Error **errp)\n+ {\n+ Error *err = NULL;\n+\n+ visit_type_UserDefOneList(v, \"arg1\", &obj->arg1, &err);\n+ if (err) {\n+ goto out;\n+ }\n+\n+ out:\n+ error_propagate(errp, err);\n+ }\n+\n === scripts/qapi-commands.py ===\n \n Used to generate the marshaling/dispatch functions for the commands\n@@ -1145,9 +1169,12 @@ Example:\n \n #include \"example-qapi-types.h\"\n #include \"qapi/qmp/qdict.h\"\n+ #include \"qapi/qmp/dispatch.h\"\n #include \"qapi/error.h\"\n \n+ void example_qmp_init_marshal(QmpCommandList *cmds);\n UserDefOne *qmp_my_command(UserDefOneList *arg1, Error **errp);\n+ void qmp_marshal_my_command(QDict *args, QObject **ret, Error **errp);\n \n #endif\n $ cat qapi-generated/example-qmp-marshal.c\n@@ -1170,19 +1197,19 @@ Example:\n visit_free(v);\n }\n \n- static void qmp_marshal_my_command(QDict *args, QObject **ret, Error **errp)\n+ void qmp_marshal_my_command(QDict *args, QObject **ret, Error **errp)\n {\n Error *err = NULL;\n UserDefOne *retval;\n Visitor *v;\n- UserDefOneList *arg1 = NULL;\n+ q_obj_my_command_arg arg = {0};\n \n v = qobject_input_visitor_new(QOBJECT(args));\n visit_start_struct(v, NULL, NULL, 0, &err);\n if (err) {\n goto out;\n }\n- visit_type_UserDefOneList(v, \"arg1\", &arg1, &err);\n+ visit_type_q_obj_my_command_arg_members(v, &arg, &err);\n if (!err) {\n visit_check_struct(v, &err);\n }\n@@ -1191,7 +1218,7 @@ Example:\n goto out;\n }\n \n- retval = qmp_my_command(arg1, &err);\n+ retval = qmp_my_command(arg.arg1, &err);\n if (err) {\n goto out;\n }\n@@ -1203,17 +1230,18 @@ Example:\n visit_free(v);\n v = qapi_dealloc_visitor_new();\n visit_start_struct(v, NULL, NULL, 0, NULL);\n- visit_type_UserDefOneList(v, \"arg1\", &arg1, NULL);\n+ visit_type_q_obj_my_command_arg_members(v, &arg, NULL);\n visit_end_struct(v, NULL);\n visit_free(v);\n }\n \n- static void qmp_init_marshal(void)\n+ void example_qmp_init_marshal(QmpCommandList *cmds)\n {\n- qmp_register_command(\"my-command\", qmp_marshal_my_command, QCO_NO_OPTIONS);\n- }\n+ QTAILQ_INIT(cmds);\n \n- qapi_init(qmp_init_marshal);\n+ qmp_register_command(cmds, \"my-command\",\n+ qmp_marshal_my_command, QCO_NO_OPTIONS);\n+ }\n \n === scripts/qapi-event.py ===\n \n@@ -1258,6 +1286,7 @@ Example:\n QDict *qmp;\n Error *err = NULL;\n QMPEventFuncEmit emit;\n+\n emit = qmp_event_get_func_emit();\n if (!emit) {\n return;\n","prefixes":["PULL","v2","32/47"]}