From: Luiz Capitulino <lcapitulino@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws
Subject: [Qemu-devel] [PULL 13/20] qapi: Show qapi-commands.py invocation in qapi-code-gen.txt
Date: Fri, 16 May 2014 11:30:28 -0400 [thread overview]
Message-ID: <1400254235-9435-14-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1400254235-9435-1-git-send-email-lcapitulino@redhat.com>
From: Markus Armbruster <armbru@redhat.com>
While there, pare down the shell prompts.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
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.9.0
next prev parent reply other threads:[~2014-05-16 15:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-16 15:30 [Qemu-devel] [PULL 00/20] QMP queue Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 01/20] qapi: Update qapi-code-gen.txt example to match current code Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 02/20] qapi: Normalize marshalling's visitor initialization and cleanup Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 03/20] qapi: Remove unused Visitor callbacks start_handle(), end_handle() Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 04/20] qapi: Replace start_optional()/end_optional() by optional() Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 05/20] qapi-visit.py: Clean up confusing push_indent() / pop_indent() use Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 06/20] qapi: Clean up shadowing of parameters and locals in inner scopes Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 07/20] qapi-visit.py: Clean up a sloppy use of field prefix Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 08/20] qapi: Un-inline visit of implicit struct Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 09/20] hmp: Call visit_end_struct() after visit_start_struct() succeeds Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 10/20] hw: Don't call visit_end_struct() after visit_start_struct() fails Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 11/20] tests: " Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 12/20] qapi: Replace uncommon use of the error API by the common one Luiz Capitulino
2014-05-16 15:30 ` Luiz Capitulino [this message]
2014-05-16 15:30 ` [Qemu-devel] [PULL 14/20] monitor: Convert sendkey to use command_completion Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 15/20] monitor: Add chardev-remove command completion Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 16/20] monitor: Add chardev-add backend argument completion Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 17/20] monitor: Add set_link arguments completion Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 18/20] monitor: Add netdev_add type argument completion Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 19/20] monitor: Add netdev_del id " Luiz Capitulino
2014-05-16 15:30 ` [Qemu-devel] [PULL 20/20] qapi: skip redundant includes Luiz Capitulino
2014-05-19 15:09 ` [Qemu-devel] [PULL 00/20] QMP queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400254235-9435-14-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).