Failed in applying to current master (
apply log)
block/block-backend.c | 8 +--
block/qcow2.c | 2 +-
block/quorum.c | 4 +-
block/write-threshold.c | 3 +-
blockjob.c | 13 ++--
cpus.c | 8 +--
docs/devel/qapi-code-gen.txt | 142 ++++++++++++++++++++++++++++++++-----------
dump.c | 3 +-
hw/acpi/core.c | 2 +-
hw/acpi/cpu.c | 2 +-
hw/acpi/memory_hotplug.c | 5 +-
hw/char/virtio-console.c | 3 +-
hw/core/qdev.c | 3 +-
hw/net/virtio-net.c | 2 +-
hw/ppc/spapr_rtc.c | 2 +-
hw/timer/mc146818rtc.c | 2 +-
hw/virtio/virtio-balloon.c | 3 +-
hw/watchdog/watchdog.c | 15 +++--
include/qapi/qmp-event.h | 3 +-
job.c | 2 +-
migration/migration.c | 4 +-
migration/ram.c | 2 +-
monitor.c | 5 +-
scripts/qapi/common.py | 11 ++--
scripts/qapi/events.py | 23 ++-----
scripts/qapi/introspect.py | 34 ++++++++---
scsi/pr-manager-helper.c | 3 +-
tests/test-qmp-event.c | 11 ++--
ui/spice-core.c | 10 ++-
ui/vnc.c | 7 +--
vl.c | 16 +++--
31 files changed, 202 insertions(+), 151 deletions(-)