The following changes since commit 7931b05987564b07ada5a4467d8e78a786a3e7d4:
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
(2014-04-25 12:22:37 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
for you to fetch changes up to 0b9f0e2fd7c5070fa06cd6bd5ec69055e3a7d2b1:
monitor: fix qmp_getfd() fd leak in error case (2014-04-25 11:41:41 -0400)
----------------------------------------------------------------
Cole Robinson (9):
slirp: Remove default_mon usage
vnc: Remove default_mon usage
error: Privatize error_print_loc
monitor: Remove unused monitor_print_filename
error: Print error_report() to stderr if using qmp
qerror.h: Remove unused error classes
qerror.h: Remove QERR defines that are only used once
qerror.h: Replace QERR_NOT_SUPPORTED with QERR_UNSUPPORTED
error: Remove some unused headers
Eduardo Habkost (1):
qmp: object-add: Validate class before creating object
Hani Benhabiles (3):
monitor: Fix drive_del id argument type completion.
monitor: Add command_completion callback to mon_cmd_t.
monitor: Add device_add and device_del completion.
Qiao Nuohan (2):
HMP: fix doc of dump-guest-memory
HMP: support specifying dump format for dump-guest-memory
Stefan Hajnoczi (1):
monitor: fix qmp_getfd() fd leak in error case
block/commit.c | 2 +-
blockdev.c | 9 +++--
blockjob.c | 2 +-
hmp-commands.hx | 36 ++++++++++++-------
hmp.c | 25 +++++++++++--
hmp.h | 5 +++
hw/9pfs/virtio-9p.c | 5 +--
hw/core/qdev-properties.c | 9 ++---
hw/misc/ivshmem.c | 4 +--
include/monitor/monitor.h | 1 -
include/qapi/qmp/qerror.h | 79 -----------------------------------------
include/qemu/error-report.h | 1 -
monitor.c | 85 ++++++++++++++++++++-------------------------
qapi/qmp-dispatch.c | 3 +-
qapi/qmp-input-visitor.c | 2 +-
qdev-monitor.c | 12 ++++---
qmp.c | 23 +++++++-----
qobject/json-parser.c | 2 +-
qom/object.c | 5 +--
savevm.c | 3 +-
slirp/misc.c | 13 ++-----
slirp/slirp.c | 8 ++---
slirp/slirp.h | 2 --
stubs/Makefile.objs | 1 -
stubs/arch-query-cpu-def.c | 2 +-
stubs/mon-print-filename.c | 6 ----
ui/vnc.c | 4 +--
util/error.c | 5 +--
util/qemu-config.c | 2 +-
util/qemu-error.c | 4 +--
util/qemu-option.c | 2 +-
31 files changed, 153 insertions(+), 209 deletions(-)
delete mode 100644 stubs/mon-print-filename.c
