Commit b62cd318 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 97f31cbc 9914fbed

MAINTAINERS

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

QMP/qmp-events.txt

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