Re: [Qemu-devel] [PATCH 16/36] qmp: register qapi commands (no middle mode)

[Eric Blake]

On 09/25/2015 08:03 AM, address@hidden wrote:
> From: Marc-André Lureau <address@hidden>
> 
> The marshal functions are no longer exported, they are registered in the
> dispatch table instead. The following patches will make use of
> qmp_dispatch(). This patch temporarily breaks qmp/hmp commands.

Should this be squashed with the patch that fixes things?

> 
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  Makefile           |   2 +-
>  qmp-commands-old.h | 129 
> -----------------------------------------------------
>  vl.c               |   1 +
>  3 files changed, 2 insertions(+), 130 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 5e09e88..9750b71 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -289,7 +289,7 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py 
> $(qapi-py)
>  qmp-commands.h qmp-marshal.c :\
>  $(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
>       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
> -             $(gen-out-type) -o "." -m $<, \
> +             $(gen-out-type) -o "." $<, \
>               "  GEN   $@")
>  qmp-introspect.h qmp-introspect.c :\
>  $(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py)
> diff --git a/qmp-commands-old.h b/qmp-commands-old.h
> index 3a7af18..956157d 100644
> --- a/qmp-commands-old.h
> +++ b/qmp-commands-old.h
> @@ -1,279 +1,225 @@
>      {
>          .name       = "quit",
>          .args_type  = "",
> -        .mhandler.cmd_new = qmp_marshal_quit,
>      },
>      {
>          .name       = "eject",
>          .args_type  = "force:-f,device:B",
> -        .mhandler.cmd_new = qmp_marshal_eject,

Do we still need .args_type?  Can it be generated instead of maintained
by hand?

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature