From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wkb5i-0007Qs-0I for qemu-devel@nongnu.org; Wed, 14 May 2014 11:27:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wkb5d-0001dP-67 for qemu-devel@nongnu.org; Wed, 14 May 2014 11:27:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wkb5c-0001dC-Vw for qemu-devel@nongnu.org; Wed, 14 May 2014 11:27:29 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4EFRRmW028084 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 14 May 2014 11:27:27 -0400 From: Markus Armbruster Date: Wed, 14 May 2014 17:27:23 +0200 Message-Id: <1400081243-21175-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] qapi: Show qapi-commands.py invocation in qapi-code-gen.txt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com While there, pare down the shell prompts. Signed-off-by: Markus Armbruster --- Note: to be applied on top of "[PATCH v2 00/12] qapi: Purge error_is_set()". docs/qapi-code-gen.txt | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt index 1948946..867d124 100644 --- a/docs/qapi-code-gen.txt +++ b/docs/qapi-code-gen.txt @@ -230,14 +230,13 @@ node structure that can be used to chain together a list of such types in case we want to accept/return a list of this type with a command), and a command which takes that type as a parameter and returns the same type: - mdroth@illuin:~/w/qemu2.git$ cat example-schema.json + $ cat example-schema.json { 'type': 'UserDefOne', 'data': { 'integer': 'int', 'string': 'str' } } { 'command': 'my-command', 'data': {'arg1': 'UserDefOne'}, 'returns': 'UserDefOne' } - mdroth@illuin:~/w/qemu2.git$ === scripts/qapi-types.py === @@ -255,9 +254,9 @@ created code. Example: - mdroth@illuin:~/w/qemu2.git$ python scripts/qapi-types.py \ - --output-dir="qapi-generated" --prefix="example-" --input-file=example-schema.json - mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qapi-types.c + $ python scripts/qapi-types.py --output-dir="qapi-generated" \ + --prefix="example-" --input-file=example-schema.json + $ cat qapi-generated/example-qapi-types.c [Uninteresting stuff omitted...] void qapi_free_UserDefOneList(UserDefOneList * obj) @@ -290,7 +289,7 @@ Example: qapi_dealloc_visitor_cleanup(md); } - mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qapi-types.h + $ cat qapi-generated/example-qapi-types.h [Uninteresting stuff omitted...] #ifndef EXAMPLE_QAPI_TYPES_H @@ -342,9 +341,9 @@ $(prefix)qapi-visit.h: declarations for previously mentioned visitor Example: - mdroth@illuin:~/w/qemu2.git$ python scripts/qapi-visit.py \ - --output-dir="qapi-generated" --prefix="example-" --input-file=example-schema.json - mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qapi-visit.c + $ python scripts/qapi-visit.py --output-dir="qapi-generated" + --prefix="example-" --input-file=example-schema.json + $ cat qapi-generated/example-qapi-visit.c [Uninteresting stuff omitted...] static void visit_type_UserDefOne_fields(Visitor *m, UserDefOne ** obj, Error **errp) @@ -400,7 +399,9 @@ Example: out: error_propagate(errp, err); } - mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qapi-visit.h + $ python scripts/qapi-commands.py --output-dir="qapi-generated" \ + --prefix="example-" --input-file=example-schema.json + $ cat qapi-generated/example-qapi-visit.h [Uninteresting stuff omitted...] #ifndef EXAMPLE_QAPI_VISIT_H @@ -412,7 +413,6 @@ Example: void visit_type_UserDefOneList(Visitor *m, UserDefOneList ** obj, const char *name, Error **errp); #endif - mdroth@illuin:~/w/qemu2.git$ === scripts/qapi-commands.py === @@ -433,7 +433,7 @@ $(prefix)qmp-commands.h: Function prototypes for the QMP commands Example: - mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qmp-marshal.c + $ cat qapi-generated/example-qmp-marshal.c [Uninteresting stuff omitted...] static void qmp_marshal_output_my_command(UserDefOne * ret_in, QObject **ret_out, Error **errp) @@ -497,7 +497,7 @@ Example: } qapi_init(qmp_init_marshal); - mdroth@illuin:~/w/qemu2.git$ cat qapi-generated/example-qmp-commands.h + $ cat qapi-generated/example-qmp-commands.h [Uninteresting stuff omitted...] #ifndef EXAMPLE_QMP_COMMANDS_H @@ -510,4 +510,3 @@ Example: UserDefOne * qmp_my_command(UserDefOne * arg1, Error **errp); #endif - mdroth@illuin:~/w/qemu2.git$ -- 1.8.1.4