Re: [Qemu-devel] [PATCH] qapi: Show qapi-commands.py invocation in qapi-code-gen.txt

[Luiz Capitulino]

On Wed, 14 May 2014 17:27:23 +0200
Markus Armbruster <address@hidden> wrote:

> While there, pare down the shell prompts.
> 
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> Note: to be applied on top of "[PATCH v2 00/12] qapi: Purge
> error_is_set()".

Applied to the qmp branch, thanks.

> 
>  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:
>  
> -    address@hidden:~/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' }
> -    address@hidden:~/w/qemu2.git$
>  
>  === scripts/qapi-types.py ===
>  
> @@ -255,9 +254,9 @@ created code.
>  
>  Example:
>  
> -    address@hidden:~/w/qemu2.git$ python scripts/qapi-types.py \
> -      --output-dir="qapi-generated" --prefix="example-" 
> --input-file=example-schema.json
> -    address@hidden:~/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);
>      }
>  
> -    address@hidden:~/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:
>  
> -    address@hidden:~/w/qemu2.git$ python scripts/qapi-visit.py \
> -        --output-dir="qapi-generated" --prefix="example-" 
> --input-file=example-schema.json
> -    address@hidden:~/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);
>      }
> -    address@hidden:~/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
> -    address@hidden:~/w/qemu2.git$
>  
>  === scripts/qapi-commands.py ===
>  
> @@ -433,7 +433,7 @@ $(prefix)qmp-commands.h: Function prototypes for the QMP 
> commands
>  
>  Example:
>  
> -    address@hidden:~/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);
> -    address@hidden:~/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
> -    address@hidden:~/w/qemu2.git$