]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 28 Apr 2014 11:56:33 +0000 (12:56 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 28 Apr 2014 11:56:34 +0000 (12:56 +0100)
commit13de54eedd40a1b01fa7176dfb96d1c22c5cfa71
tree6662ce703da44cec201298be591d4a263d027999
parenta41b2c995b52b2ce26c171c52ac7dc11c7dccd99
parent0b9f0e2fd7c5070fa06cd6bd5ec69055e3a7d2b1
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  monitor: fix qmp_getfd() fd leak in error case
  HMP: support specifying dump format for dump-guest-memory
  HMP: fix doc of dump-guest-memory
  qmp: object-add: Validate class before creating object
  monitor: Add device_add and device_del completion.
  monitor: Add command_completion callback to mon_cmd_t.
  monitor: Fix drive_del id argument type completion.
  error: Remove some unused headers
  qerror.h: Replace QERR_NOT_SUPPORTED with QERR_UNSUPPORTED
  qerror.h: Remove QERR defines that are only used once
  qerror.h: Remove unused error classes
  error: Print error_report() to stderr if using qmp
  monitor: Remove unused monitor_print_filename
  error: Privatize error_print_loc
  vnc: Remove default_mon usage
  slirp: Remove default_mon usage

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
blockdev.c