diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-10 11:45:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-10 11:45:09 +0100 |
| commit | 0cb0155711ccfdb7c0ebc0e58af071850e7e2f1f (patch) | |
| tree | 5941abfcc7930c45c39dfef98e2e18d4fcf868a2 /MAINTAINERS | |
| parent | 86e121ae75d10d0aa4ef76150e94a2e83bdac3e9 (diff) | |
| parent | 77a6da267c37781331c2dc8c4ac7f68d46a2a461 (diff) | |
| download | qemu-0cb0155711ccfdb7c0ebc0e58af071850e7e2f1f.tar.gz qemu-0cb0155711ccfdb7c0ebc0e58af071850e7e2f1f.tar.bz2 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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9bca506365..a4d2dd4d52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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> |