Commit 0cb01557 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 86e121ae 77a6da26

MAINTAINERS

+4 −5
Original line number Diff line number Diff line
@@ -1178,12 +1178,11 @@ F: qemu-timer.c 
F: vl.c



Human Monitor (HMP)

M: Luiz Capitulino <lcapitulino@redhat.com>

M: Dr. David Alan Gilbert <dgilbert@redhat.com>

S: Maintained

F: monitor.c

F: hmp.c

F: hmp-commands.hx

T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp



Network device backends

M: Jason Wang <jasowang@redhat.com>
@@ -1248,8 +1247,8 @@ F: qapi/*.json 
T: git git://repo.or.cz/qemu/armbru.git qapi-next



QObject

M: Luiz Capitulino <lcapitulino@redhat.com>

S: Maintained

M: Markus Armbruster <armbru@redhat.com>

S: Supported

F: qobject/

F: include/qapi/qmp/

X: include/qapi/qmp/dispatch.h
@@ -1259,7 +1258,7 @@ F: tests/check-qint.c 
F: tests/check-qjson.c

F: tests/check-qlist.c

F: tests/check-qstring.c

T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

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



QEMU Guest Agent

M: Michael Roth <mdroth@linux.vnet.ibm.com>

docs/qmp-commands.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Also, the following notation is used to denote data flow: 
-> data issued by the Client

<- Server data response



Please, refer to the QMP specification (QMP/qmp-spec.txt) for detailed

Please, refer to the QMP specification (docs/qmp-spec.txt) for detailed

information on the Server command and response formats.



NOTE: This document is temporary and will be replaced soon.

docs/writing-qmp-commands.txt

+2 −2
Original line number Diff line number Diff line
@@ -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 ==

docs/xen-save-devices-state.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ however it is also possible to save the state of all devices to file, 
without saving the RAM or the block devices of the VM.



This operation is called "xen-save-devices-state" (see

QMP/qmp-commands.txt)

qmp-commands.txt)





The binary format used in the file is the following:

monitor.c

+9 −0
Original line number Diff line number Diff line
@@ -986,6 +986,15 @@ static void qmp_unregister_commands_hack(void) 
#ifndef TARGET_ARM

    qmp_unregister_command("query-gic-capabilities");

#endif

#if !defined(TARGET_S390X)

    qmp_unregister_command("query-cpu-model-expansion");

    qmp_unregister_command("query-cpu-model-baseline");

    qmp_unregister_command("query-cpu-model-comparison");

#endif

#if !defined(TARGET_PPC) && !defined(TARGET_ARM) && !defined(TARGET_I386) \

    && !defined(TARGET_S390X)

    qmp_unregister_command("query-cpu-definitions");

#endif

}



static void qmp_init_marshal(void)