diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-12 09:01:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-12 09:01:51 +0100 |
| commit | 704eb1c09963149db4a3407d5ba173ba2a9244bb (patch) | |
| tree | 8a1a55bf1dcb52891615a51a37c06a1b7b3eefa2 /MAINTAINERS | |
| parent | 0403b0f539f40a21da60409b825b4653b273ab39 (diff) | |
| parent | 1ceca07e48ead0dd2e41576c81d40e6a91cafefd (diff) | |
Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging
QMP pull request
# gpg: Signature made Mon May 11 14:15:19 2015 BST using RSA key ID E24ED5A7
# gpg: Good signature from "Luiz Capitulino <lcapitulino@gmail.com>"
* remotes/qmp-unstable/tags/for-upstream:
scripts: qmp-shell: Add verbose flag
scripts: qmp-shell: add transaction subshell
scripts: qmp-shell: Expand support for QMP expressions
scripts: qmp-shell: refactor helpers
MAINTAINERS: New maintainer for QMP and QAPI
json-parser: Accept 'null' in QMP
qobject: Add a special null QObject
qobject: Clean up around qtype_code
QJSON: Use OBJECT_CHECK
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0b67c4826a..d858c49566 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -926,20 +926,19 @@ K: srat|SRAT T: git git://github.com/ehabkost/qemu.git numa QAPI -M: Luiz Capitulino <lcapitulino@redhat.com> +M: Markus Armbruster <armbru@redhat.com> M: Michael Roth <mdroth@linux.vnet.ibm.com> -S: Maintained +S: Supported F: qapi/ F: tests/qapi-schema/ -T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp +T: git git://repo.or.cz/qemu/armbru.git qapi-next QAPI Schema M: Eric Blake <eblake@redhat.com> -M: Luiz Capitulino <lcapitulino@redhat.com> M: Markus Armbruster <armbru@redhat.com> S: Supported F: qapi-schema.json -T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp +T: git git://repo.or.cz/qemu/armbru.git qapi-next QObject M: Luiz Capitulino <lcapitulino@redhat.com> @@ -964,13 +963,14 @@ X: qom/cpu.c F: tests/qom-test.c QMP -M: Luiz Capitulino <lcapitulino@redhat.com> -S: Maintained +M: Markus Armbruster <armbru@redhat.com> +S: Supported F: qmp.c F: monitor.c F: qmp-commands.hx -F: QMP/ -T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp +F: docs/qmp/ +F: scripts/qmp/ +T: git git://repo.or.cz/qemu/armbru.git qapi-next SLIRP M: Jan Kiszka <jan.kiszka@siemens.com> |