]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 13 Aug 2012 21:12:35 +0000 (16:12 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 13 Aug 2012 21:12:35 +0000 (16:12 -0500)
* qmp/queue/qmp: (48 commits)
  target-ppc: add implementation of query-cpu-definitions (v2)
  target-i386: add implementation of query-cpu-definitions (v2)
  qapi: add query-cpu-definitions command (v2)
  compiler: add macro for GCC weak symbols
  qapi: add query-machines command
  qapi: mark QOM commands stable
  qmp: introduce device-list-properties command
  qmp: add SUSPEND_DISK event
  qmp: qmp-events.txt: add missing doc for the SUSPEND event
  qmp: qmp-events.txt: put events in alphabetical order
  qmp: emit the WAKEUP event when the guest is put to run
  qmp: don't emit the RESET event on wakeup from S3
  scripts: qapi-commands.py: qmp-commands.h: include qdict.h
  docs: writing-qmp-commands.txt: update error section
  error, qerror: drop QDict member
  qerror: drop qerror_table and qerror_format()
  error, qerror: pass desc string to error calls
  error: drop error_get_qobject()/error_set_qobject()
  qemu-ga: switch to the new error format on the wire
  qmp: switch to the new error format on the wire
  ...

1  2 
Makefile.objs
configure
hmp.c
hmp.h
monitor.c
qapi-schema.json
qmp-commands.hx

diff --cc Makefile.objs
Simple merge
diff --cc configure
Simple merge
diff --cc hmp.c
Simple merge
diff --cc hmp.h
Simple merge
diff --cc monitor.c
Simple merge
Simple merge
diff --cc qmp-commands.hx
Simple merge