[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 04/15] qapi: use middle mode in QMP server (v2)
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH 04/15] qapi: use middle mode in QMP server (v2) |
Date: |
Fri, 2 Sep 2011 17:39:03 -0300 |
On Fri, 2 Sep 2011 12:34:47 -0500
Anthony Liguori <address@hidden> wrote:
> Use the new middle mode within the existing QMP server.
>
> Signed-off-by: Anthony Liguori <address@hidden>
> ---
> v1 -> v2
> - fixed some of the generated header dependencies
> ---
> Makefile | 12 ++++++++++++
> Makefile.objs | 2 ++
> Makefile.target | 6 +++---
> monitor.c | 11 ++++++++---
> qapi-schema.json | 3 +++
> 5 files changed, 28 insertions(+), 6 deletions(-)
> create mode 100644 qapi-schema.json
>
> diff --git a/Makefile b/Makefile
> index e0cf51a..8c010d7 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -4,6 +4,7 @@ GENERATED_HEADERS = config-host.h trace.h qemu-options.def
> ifeq ($(TRACE_BACKEND),dtrace)
> GENERATED_HEADERS += trace-dtrace.h
> endif
> +GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
>
> ifneq ($(wildcard config-host.mak),)
> # Put the all: rule here so that config-host.mak can contain dependencies.
> @@ -184,9 +185,20 @@ $(qapi-dir)/qga-qapi-types.h:
> $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scr
> $(qapi-dir)/qga-qapi-visit.c: $(qapi-dir)/qga-qapi-visit.h
> $(qapi-dir)/qga-qapi-visit.h: $(SRC_PATH)/qapi-schema-guest.json
> $(SRC_PATH)/scripts/qapi-visit.py
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o
> "$(qapi-dir)" -p "qga-" < $<, " GEN $@")
> +$(qapi-dir)/qga-qmp-commands.h: $(qapi-dir)/qga-qmp-marshal.c
> $(qapi-dir)/qga-qmp-marshal.c: $(SRC_PATH)/qapi-schema-guest.json
> $(SRC_PATH)/scripts/qapi-commands.py
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -o
> "$(qapi-dir)" -p "qga-" < $<, " GEN $@")
>
> +qapi-types.c: qapi-types.h
> +qapi-types.h: $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py
> + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py -o "."
> < $<, " GEN $@")
> +qapi-visit.c: qapi-visit.h
> +qapi-visit.h: $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py
> + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py -o "."
> < $<, " GEN $@")
> +qmp-commands.h: qmp-marshal.c
> +qmp-marshal.c: $(SRC_PATH)/qapi-schema.json
> $(SRC_PATH)/scripts/qapi-commands.py
> + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -m
> -o "." < $<, " GEN $@")
> +
> test-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c
> test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)
> test-visitor: test-visitor.o qfloat.o qint.o qdict.o qstring.o qlist.o
> qbool.o $(qapi-obj-y) error.o osdep.o $(oslib-obj-y) qjson.o json-streamer.o
> json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o
> $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 26b885b..4821484 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -402,6 +402,8 @@ qapi-nested-y = qapi-visit-core.o qmp-input-visitor.o
> qmp-output-visitor.o qapi-
> qapi-nested-y += qmp-registry.o qmp-dispatch.o
> qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y))
>
> +common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o $(qapi-obj-y)
> +
> ######################################################################
> # guest agent
>
> diff --git a/Makefile.target b/Makefile.target
> index 0787758..84f7e49 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -371,7 +371,7 @@ obj-alpha-y += vga.o cirrus_vga.o
>
> main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
>
> -monitor.o: hmp-commands.h qmp-commands.h
> +monitor.o: hmp-commands.h qmp-commands-old.h
>
> $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
>
> @@ -403,13 +403,13 @@ gdbstub-xml.c: $(TARGET_XML_FILES)
> $(SRC_PATH)/scripts/feature_to_c.sh
> hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
> $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN
> $(TARGET_DIR)$@")
>
> -qmp-commands.h: $(SRC_PATH)/qmp-commands.hx
> +qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx
> $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN
> $(TARGET_DIR)$@")
>
> clean:
> rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
> rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o
> - rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c
> + rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c
> ifdef CONFIG_TRACE_SYSTEMTAP
> rm -f *.stp
> endif
> diff --git a/monitor.c b/monitor.c
> index df0f622..628e156 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -121,6 +121,7 @@ typedef struct mon_cmd_t {
> int (*cmd_async)(Monitor *mon, const QDict *params,
> MonitorCompletion *cb, void *opaque);
> } mhandler;
> + bool qapi;
> int flags;
> } mon_cmd_t;
>
> @@ -3159,7 +3160,7 @@ static const mon_cmd_t info_cmds[] = {
> };
>
> static const mon_cmd_t qmp_cmds[] = {
> -#include "qmp-commands.h"
> +#include "qmp-commands-old.h"
> { /* NULL */ },
> };
>
> @@ -5029,10 +5030,14 @@ static void qmp_call_query_cmd(Monitor *mon, const
> mon_cmd_t *cmd)
> if (monitor_has_error(mon)) {
> monitor_protocol_emitter(mon, NULL);
> }
> - } else {
> - cmd->mhandler.info_new(mon, &ret_data);
The else clause can't be dropped, otherwise non-qapi converted query
commands won't work.
I can fix it myself in case this is going through my tree (and in case
there isn't any other change request).
> + } else if (cmd->qapi) {
> + QDict *args = qdict_new();
> +
> + cmd->mhandler.cmd_new(mon, args, &ret_data);
> monitor_protocol_emitter(mon, ret_data);
> qobject_decref(ret_data);
> +
> + QDECREF(args);
> }
> }
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> new file mode 100644
> index 0000000..7fcefdb
> --- /dev/null
> +++ b/qapi-schema.json
> @@ -0,0 +1,3 @@
> +# -*- Mode: Python -*-
> +#
> +# QAPI Schema
- [Qemu-devel] [PATCH 00/15] Convert commands to QAPI (batch 1) (v2), Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 01/15] error: let error_is_type take a NULL error, Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 02/15] qerror: add qerror_report_err() (v2), Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 03/15] qapi: add code generation support for middle mode, Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 04/15] qapi: use middle mode in QMP server (v2), Anthony Liguori, 2011/09/02
- Re: [Qemu-devel] [PATCH 04/15] qapi: use middle mode in QMP server (v2),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 05/15] qapi: convert query-name, Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 07/15] monitor: expose readline state, Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 08/15] qerror: add additional parameter to QERR_DEVICE_ENCRYPTED, Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 06/15] block: add unsafe_probe, Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 09/15] qapi: convert eject (qmp and hmp) to QAPI, Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 10/15] qapi: convert block_passwd and add set-blockdev-password, Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 11/15] qapi: add change-vnc-password (v2), Anthony Liguori, 2011/09/02
- [Qemu-devel] [PATCH 12/15] qapi: add change-vnc-listen (v2), Anthony Liguori, 2011/09/02