I'm afraid this pull is fairly prone to conflicts. Fingers crossed...
The following changes since commit 0a3346f5dea0a679322df804e1e78d7c10d12a9f:
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter'
into staging (2015-06-22 12:50:30 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-06-22
for you to fetch changes up to a0b1a66ea39bca011108734147a72232a4d08c7a:
Include monitor/monitor.h exactly where needed (2015-06-22 18:20:41 +0200)
----------------------------------------------------------------
Monitor patches
----------------------------------------------------------------
Bandan Das (4):
monitor: remove debug prints
monitor: cleanup parsing of cmd name and cmd arguments
monitor: Point to "help" command on syntax error
monitor: Fix failure path for "S" argument
Eric Blake (2):
qobject: Use 'bool' for qbool
qobject: Use 'bool' inside qdict
Markus Armbruster (16):
qdev-monitor: Stop error avalanche in qbus_find_recursive()
qdev-monitor: Fix check for full bus
qdev-monitor: Convert qbus_find() to Error
qdev-monitor: Propagate errors through set_property()
qdev-monitor: Propagate errors through qdev_device_add()
QemuOpts: Wean off qerror_report_err()
vl: Avoid qerror_report() outside QMP command handlers
vl: Use error_report() for --display errors
qerror: Eliminate QERR_DEVICE_NOT_FOUND
qerror: Clean up QERR_ macros to expand into a single string
tpm: Avoid qerror_report() outside QMP command handlers
qmp: Wean off qerror_report()
qerror: Finally unused, clean up
qerror: Move #include out of qerror.h
Include qapi/qmp/qerror.h exactly where needed
Include monitor/monitor.h exactly where needed
Peter Crosthwaite (2):
monitor: Split mon_get_cpu fn to remove ENV_GET_CPU
disas: Remove uses of CPU env
audio/spiceaudio.c | 1 +
audio/wavcapture.c | 1 +
backends/hostmem.c | 1 -
backends/rng-egd.c | 11 +-
backends/rng-random.c | 6 +-
backends/rng.c | 2 +-
backends/tpm.c | 2 +-
balloon.c | 5 +-
block.c | 4 +-
block/backup.c | 5 +-
block/commit.c | 3 +-
block/curl.c | 1 +
block/dmg.c | 1 +
block/io.c | 1 +
block/iscsi.c | 1 +
block/mirror.c | 9 +-
block/qapi.c | 8 +-
block/qcow.c | 5 +-
block/qcow2-snapshot.c | 1 +
block/qcow2.c | 4 +-
block/qed.c | 4 +-
block/quorum.c | 9 +-
block/raw-posix.c | 2 +
block/raw-win32.c | 1 +
block/snapshot.c | 5 +-
block/ssh.c | 2 +
block/stream.c | 5 +-
block/vhdx-log.c | 1 +
block/vmdk.c | 14 +-
block/vvfat.c | 5 +-
blockdev-nbd.c | 6 +-
blockdev.c | 80 ++++++-----
blockjob.c | 9 +-
cpus.c | 9 +-
disas.c | 14 +-
dump.c | 13 +-
hmp.c | 64 +++++----
hw/9pfs/virtio-9p.c | 1 +
hw/char/serial-pci.c | 1 -
hw/char/virtio-serial-bus.c | 1 +
hw/core/nmi.c | 2 +-
hw/core/platform-bus.c | 1 -
hw/core/qdev-properties-system.c | 4 +-
hw/core/qdev-properties.c | 13 +-
hw/core/qdev.c | 9 +-
hw/display/g364fb.c | 1 +
hw/display/qxl.c | 1 -
hw/display/tcx.c | 1 +
hw/dma/xilinx_axidma.c | 1 -
hw/i386/pc.c | 2 +-
hw/ide/ahci.c | 2 +-
hw/intc/openpic.c | 6 +-
hw/misc/ivshmem.c | 2 +-
hw/net/rocker/qmp-norocker.c | 8 +-
hw/net/xilinx_axienet.c | 1 -
hw/pci/pci-stub.c | 3 +-
hw/pci/pci.c | 1 +
hw/pci/pcie.c | 1 -
hw/pci/pcie_aer.c | 4 +-
hw/pci/shpc.c | 1 -
hw/ppc/spapr_pci.c | 8 +-
hw/ppc/spapr_vio.c | 1 -
hw/ppc/virtex_ml507.c | 2 +-
hw/s390x/event-facility.c | 1 -
hw/s390x/s390-virtio-bus.c | 1 -
hw/s390x/s390-virtio.c | 4 +-
hw/s390x/virtio-ccw.c | 2 +-
hw/scsi/vhost-scsi.c | 1 +
hw/timer/hpet.c | 1 +
hw/tpm/tpm_passthrough.c | 1 +
hw/usb/bus.c | 1 +
hw/usb/ccid-card-emulated.c | 1 -
hw/usb/ccid-card-passthru.c | 2 +-
hw/usb/dev-network.c | 2 +-
hw/usb/dev-serial.c | 2 +-
hw/usb/dev-smartcard-reader.c | 1 -
hw/usb/dev-storage.c | 1 +
hw/usb/hcd-ehci.h | 1 -
hw/usb/host-libusb.c | 1 +
hw/usb/redirect.c | 9 +-
hw/virtio/virtio-rng.c | 1 -
include/block/block_int.h | 2 -
include/disas/disas.h | 4 +-
include/monitor/monitor.h | 9 +-
include/monitor/qdev.h | 7 +-
include/net/net.h | 2 +-
include/qapi/qmp/qbool.h | 8 +-
include/qapi/qmp/qdict.h | 4 +-
include/qapi/qmp/qerror.h | 88 +++++-------
include/qapi/qmp/qobject.h | 1 -
include/qemu/log.h | 4 +-
include/qemu/option.h | 5 +-
include/qemu/sockets.h | 1 -
include/sysemu/balloon.h | 1 -
include/ui/console.h | 4 +-
include/ui/qemu-spice.h | 2 -
migration/migration.c | 38 ++---
migration/qemu-file-buf.c | 1 +
migration/qemu-file.c | 1 +
migration/rdma.c | 1 +
migration/savevm.c | 4 +-
monitor.c | 301 ++++++++++++++++++---------------------
net/l2tpv3.c | 1 -
net/net.c | 41 +++---
net/slirp.c | 1 +
numa.c | 1 -
qapi/opts-visitor.c | 24 ++--
qapi/qapi-visit-core.c | 28 ++--
qapi/qmp-dispatch.c | 12 +-
qapi/qmp-input-visitor.c | 30 ++--
qapi/qmp-output-visitor.c | 3 +-
qapi/string-input-visitor.c | 24 ++--
qapi/string-output-visitor.c | 1 -
qdev-monitor.c | 170 ++++++++++++----------
qemu-char.c | 1 +
qemu-img.c | 6 +-
qemu-io-cmds.c | 1 +
qemu-io.c | 4 +-
qemu-nbd.c | 4 +-
qga/commands-posix.c | 40 +++---
qga/commands-win32.c | 66 ++++-----
qga/main.c | 4 +-
qmp-commands.hx | 4 +-
qmp.c | 97 +++++--------
qobject/Makefile.objs | 1 -
qobject/json-parser.c | 7 +-
qobject/qbool.c | 8 +-
qobject/qdict.c | 8 +-
qobject/qerror.c | 148 -------------------
qobject/qjson.c | 5 +-
qom/object.c | 22 +--
scripts/qapi-commands.py | 42 +-----
slirp/misc.c | 1 +
stubs/Makefile.objs | 1 -
stubs/arch-query-cpu-def.c | 2 +-
stubs/dump.c | 1 -
stubs/mon-is-qmp.c | 2 +
stubs/mon-set-error.c | 8 --
target-alpha/translate.c | 2 +-
target-arm/cpu.c | 1 -
target-arm/translate-a64.c | 2 +-
target-arm/translate.c | 2 +-
target-cris/translate.c | 2 +-
target-i386/cpu.c | 20 +--
target-i386/kvm.c | 1 -
target-i386/translate.c | 2 +-
target-lm32/translate.c | 2 +-
target-m68k/translate.c | 2 +-
target-microblaze/translate.c | 2 +-
target-mips/translate.c | 2 +-
target-openrisc/translate.c | 2 +-
target-ppc/translate.c | 2 +-
target-s390x/kvm.c | 2 +-
target-s390x/translate.c | 2 +-
target-sh4/translate.c | 2 +-
target-sparc/translate.c | 2 +-
target-tricore/translate.c | 2 +-
target-unicore32/translate.c | 2 +-
target-xtensa/translate.c | 2 +-
tests/check-qjson.c | 11 +-
tests/test-opts-visitor.c | 3 +-
tests/test-qemu-opts.c | 2 +-
tests/test-qmp-event.c | 4 +-
tests/test-qmp-output-visitor.c | 6 +-
tpm.c | 12 +-
ui/input-legacy.c | 1 -
ui/input.c | 4 +-
ui/spice-core.c | 1 +
ui/spice-display.c | 1 -
ui/vnc-jobs.c | 1 +
ui/vnc.c | 10 +-
util/osdep.c | 1 +
util/qemu-config.c | 1 -
util/qemu-error.c | 5 +-
util/qemu-option.c | 49 ++++---
vl.c | 150 +++++++++++--------
176 files changed, 952 insertions(+), 1101 deletions(-)
delete mode 100644 qobject/qerror.c
delete mode 100644 stubs/mon-set-error.c
--
1.9.3
