Commit e3193601 authored by Anthony Liguori's avatar Anthony Liguori Committed by Luiz Capitulino
Browse files

qapi: use middle mode in QMP server 



Use the new middle mode within the existing QMP server.

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 776574d6

Makefile

+12 −0
Original line number Diff line number Diff line
@@ -7,6 +7,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.
@@ -187,9 +188,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

Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -406,6 +406,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

Makefile.target

+3 −3
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ obj-xtensa-y += xtensa-semi.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)
@@ -407,13 +407,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

monitor.c

+4 −5
Original line number Diff line number Diff line
@@ -122,6 +122,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;
@@ -3182,7 +3183,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 */ },

};
@@ -5107,12 +5108,10 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) 
        goto err_out;

    }



    if (strstart(cmd_name, "query-", &query_cmd)) {

        cmd = qmp_find_query_cmd(query_cmd);

    } else {

    cmd = qmp_find_cmd(cmd_name);

    if (!cmd && strstart(cmd_name, "query-", &query_cmd)) {

        cmd = qmp_find_query_cmd(query_cmd);

    }



    if (!cmd) {

        qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);

        goto err_out;

qapi-schema.json

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# -*- Mode: Python -*-

#

# QAPI Schema