diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-10 11:37:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-10 11:37:47 -0500 |
| commit | b62cd318daaa3d94c150d87dc2c8466b9463cef5 (patch) | |
| tree | 2e196a8f9a9e51d32d0749c938b3f09492f8c222 | |
| parent | 97f31cbc71fc13b3091893313a555c3cf1ecb798 (diff) | |
| parent | 9914fbedf21f1ffd45af67c8f3fe8a2e8f7e7785 (diff) | |
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Luiz Capitulino (2) and Marcelo Tosatti (1)
# Via Luiz Capitulino
* luiz/queue/qmp:
correct RTC_CHANGE_EVENT description (v2)
MAINTAINERS: split Monitor (QMP/HMP) entry
MAINTAINERS: new maintainers for qapi-schema.json
Message-id: 1370634855-18337-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | MAINTAINERS | 26 | ||||
| -rw-r--r-- | QMP/qmp-events.txt | 3 |
2 files changed, 26 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index be02724e6e..13c0cc590c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -685,11 +685,12 @@ M: Anthony Liguori <aliguori@us.ibm.com> S: Supported F: vl.c -Monitor (QMP/HMP) +Human Monitor (HMP) M: Luiz Capitulino <lcapitulino@redhat.com> -M: Markus Armbruster <armbru@redhat.com> S: Supported F: monitor.c +F: hmp.c +F: hmp-commands.hx Network device layer M: Anthony Liguori <aliguori@us.ibm.com> @@ -706,6 +707,27 @@ F: nbd.* F: qemu-nbd.c T: git git://github.com/bonzini/qemu.git nbd-next +QAPI +M: Luiz Capitulino <lcapitulino@redhat.com> +M: Michael Roth <mdroth@linux.vnet.ibm.com> +S: Supported +F: qapi/ + +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 + +QMP +M: Luiz Capitulino <lcapitulino@redhat.com> +S: Supported +F: qmp.c +F: monitor.c +F: qmp-commands.hx +F: QMP/ + SLIRP M: Jan Kiszka <jan.kiszka@siemens.com> S: Maintained diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index 92fe5fb406..24e804e948 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -203,7 +203,8 @@ Emitted when the guest changes the RTC time. Data: -- "offset": delta against the host UTC in seconds (json-number) +- "offset": Offset between base RTC clock (as specified by -rtc base), and +new RTC clock value (json-number) Example: |