Commit 33e1666b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-09-19' into staging 



QAPI patches for 2016-09-19

# gpg: Signature made Mon 19 Sep 2016 17:27:42 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2016-09-19:
  Replace qmp-commands.hx by docs/qmp-commands.txt
  qmp-commands.hx: fix some styling
  build-sys: remove qmp-commands-old.h
  monitor: use qmp_dispatch()
  tests: add a test to check invalid args
  qapi: check invalid arguments on no-args commands
  qapi: remove the "middle" mode
  monitor: remove mhandler.cmd_new
  monitor: implement 'qmp_query_commands' without qmp_cmds
  monitor: use qmp_find_command() (using generated qapi code)
  qapi: export the marshallers
  qmp: Hack to keep commands configuration-specific
  qapi: Support unregistering QMP commands
  monitor: register gen:false commands manually
  monitor: simplify invalid_qmp_mode()
  qapi-schema: add 'device_add'
  qapi-schema: use generated marshaller for 'qmp_capabilities'
  build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO}

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3d47a139 bd6092e4

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
/qemu-monitor-info.texi

/qemu-version.h

/qemu-version.h.tmp

/qmp-commands.txt

/vscclient

/fsdev/virtfs-proxy-helper

*.[1-9]

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,6 @@ M: Markus Armbruster <armbru@redhat.com> 
S: Supported

F: qmp.c

F: monitor.c

F: qmp-commands.hx

F: docs/*qmp-*

F: scripts/qmp/

T: git git://repo.or.cz/qemu/armbru.git qapi-next

Makefile

+2 −6
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) 


ifdef BUILD_DOCS

DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8

DOCS+=qmp-commands.txt

ifdef CONFIG_VIRTFS

DOCS+=fsdev/virtfs-proxy-helper.1

endif
@@ -312,7 +311,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)
@@ -432,7 +431,7 @@ endif 
install-doc: $(DOCS)

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) docs/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"

ifdef CONFIG_POSIX

	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"

	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
@@ -555,9 +554,6 @@ qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool 
qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")



qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@,"  GEN   $@")



qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")

Makefile.target

+2 −5
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ else 
obj-y += hw/$(TARGET_BASE_ARCH)/

endif



GENERATED_HEADERS += hmp-commands.h hmp-commands-info.h qmp-commands-old.h

GENERATED_HEADERS += hmp-commands.h hmp-commands-info.h



endif # CONFIG_SOFTMMU
@@ -209,13 +209,10 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool 
hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")



qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")



clean: clean-target

	rm -f *.a *~ $(PROGS)

	rm -f $(shell find . -name '*.[od]')

	rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c

	rm -f hmp-commands.h gdbstub-xml.c

ifdef CONFIG_TRACE_SYSTEMTAP

	rm -f *.stp

endif

docs/qapi-code-gen.txt

+3 −3
Original line number Diff line number Diff line
@@ -964,9 +964,9 @@ Example: 


Used to generate the marshaling/dispatch functions for the commands

defined in the schema. The generated code implements

qmp_marshal_COMMAND() (mentioned in qmp-commands.hx, and registered

automatically), and declares qmp_COMMAND() that the user must

implement.  The following files are generated:

qmp_marshal_COMMAND() (registered automatically), and declares

qmp_COMMAND() that the user must implement.  The following files are

generated:



$(prefix)qmp-marshal.c: command marshal/dispatch functions for each

                        QMP command defined in the schema. Functions