Commit bd6092e4 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

Replace qmp-commands.hx by docs/qmp-commands.txt 



The only remaining function of qmp-commands.hx is to let us generate
qmp-commands.txt from it.  Replace qmp-commands.hx by qmp-commands.txt.

We intend to move the documentation into the QAPI schema and generate
qapi-commands.txt from it, but not right now.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20160912091913.15831-19-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent bdf05133

.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
@@ -1235,7 +1235,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

+1 −5
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
@@ -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   $@")

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

qmp-commands.hx→docs/qmp-commands.txt

+0 −1127

File changed and moved.

Preview size limit exceeded, changes collapsed.