summaryrefslogtreecommitdiffstats
path: root/docs/writing-qmp-commands.txt
diff options
context:
space:
mode:
authorPeter Maydell2016-10-10 12:45:09 +0200
committerPeter Maydell2016-10-10 12:45:09 +0200
commit0cb0155711ccfdb7c0ebc0e58af071850e7e2f1f (patch)
tree5941abfcc7930c45c39dfef98e2e18d4fcf868a2 /docs/writing-qmp-commands.txt
parentMerge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff)
parentdocs: Belatedly update for move of QMP/* to docs/ (diff)
downloadqemu-0cb0155711ccfdb7c0ebc0e58af071850e7e2f1f.tar.gz
qemu-0cb0155711ccfdb7c0ebc0e58af071850e7e2f1f.tar.xz
qemu-0cb0155711ccfdb7c0ebc0e58af071850e7e2f1f.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-10-07' into staging
QAPI patches for 2016-10-07 # gpg: Signature made Fri 07 Oct 2016 18:55:40 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-10-07: docs: Belatedly update for move of QMP/* to docs/ docs: Belatedly update for move of qmp-commands.txt qmp: Disable query-cpu-* commands when they're unavailable MAINTAINERS: Pass the QObject staff from Luiz to Markus MAINTAINERS: Pass the HMP staff from Luiz to David qapi: return a 'missing parameter' error qapi: assert list entry has a value qapi: add assert about root value tests/test-qmp-input-strict: Cover missing struct members qapi: Fix crash when 'any' or 'null' parameter is missing qmp: fix object-add assert() without props Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/writing-qmp-commands.txt')
-rw-r--r--docs/writing-qmp-commands.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/writing-qmp-commands.txt b/docs/writing-qmp-commands.txt
index cfa6fe7c0d..44c14db418 100644
--- a/docs/writing-qmp-commands.txt
+++ b/docs/writing-qmp-commands.txt
@@ -7,8 +7,8 @@ This document doesn't discuss QMP protocol level details, nor does it dive
into the QAPI framework implementation.
For an in-depth introduction to the QAPI framework, please refer to
-docs/qapi-code-gen.txt. For documentation about the QMP protocol, please
-check the files in QMP/.
+docs/qapi-code-gen.txt. For documentation about the QMP protocol,
+start with docs/qmp-intro.txt.
== Overview ==