docs/devel/qapi-code-gen.rst | 29 ++++- docs/devel/writing-monitor-commands.rst | 14 +-- include/monitor/monitor.h | 3 +- audio/alsaaudio.c | 2 +- audio/audio.c | 6 +- audio/audio_legacy.c | 17 ++- audio/ossaudio.c | 8 +- audio/paaudio.c | 12 +- audio/sndioaudio.c | 2 +- audio/wavaudio.c | 2 +- backends/tpm/tpm_passthrough.c | 2 - block/block-backend.c | 2 +- block/copy-before-write.c | 2 +- block/dirty-bitmap.c | 1 - block/export/export.c | 2 +- block/export/vduse-blk.c | 3 +- block/gluster.c | 3 - block/monitor/block-hmp-cmds.c | 48 ++++---- block/qapi-sysemu.c | 73 +++++------- block/qapi.c | 62 ++++------- block/qcow.c | 10 +- block/qcow2.c | 18 ++- block/qed.c | 2 +- block/quorum.c | 2 +- block/rbd.c | 17 +-- block/ssh.c | 2 +- blockdev-nbd.c | 9 +- blockdev.c | 185 +++++++++++++------------------ blockjob.c | 2 - chardev/char-file.c | 4 +- chardev/char-socket.c | 10 +- chardev/char-udp.c | 1 - chardev/char.c | 6 +- crypto/block-luks.c | 16 +-- dump/dump.c | 4 +- hw/acpi/core.c | 14 +-- hw/acpi/cpu.c | 1 - hw/acpi/memory_hotplug.c | 3 +- hw/core/machine-hmp-cmds.c | 2 +- hw/core/machine-qmp-cmds.c | 9 +- hw/core/machine.c | 10 +- hw/core/numa.c | 8 +- hw/core/qdev.c | 2 +- hw/mem/pc-dimm.c | 1 - hw/net/rocker/rocker_of_dpa.c | 13 +-- hw/net/virtio-net.c | 3 +- hw/nvram/fw_cfg.c | 2 +- hw/pci/pci.c | 2 - hw/ppc/spapr.c | 2 +- hw/ppc/spapr_drc.c | 3 +- hw/virtio/virtio-mem-pci.c | 4 +- hw/virtio/virtio-pmem-pci.c | 1 - hw/virtio/virtio.c | 1 - job-qmp.c | 3 +- migration/block-dirty-bitmap.c | 4 +- migration/colo.c | 1 - migration/migration.c | 27 ++--- monitor/hmp-cmds.c | 84 +++++++------- monitor/misc.c | 21 +--- monitor/qmp-cmds.c | 11 +- nbd/server.c | 15 +-- net/announce.c | 8 +- net/hub.c | 2 +- net/l2tpv3.c | 2 +- net/net.c | 25 ++--- net/slirp.c | 4 +- net/socket.c | 18 +-- net/tap-win32.c | 2 +- net/tap.c | 51 +++++---- net/vhost-vdpa.c | 6 +- net/vmnet-host.c | 20 ++-- net/vmnet-shared.c | 16 +-- qemu-img.c | 13 +-- qemu-nbd.c | 2 - qga/commands-posix.c | 32 ++---- qga/commands-win32.c | 40 ++----- qga/commands.c | 11 +- qom/qom-qmp-cmds.c | 7 +- replay/replay-debugging.c | 1 - softmmu/runstate.c | 18 +-- softmmu/vl.c | 2 +- stubs/qdev.c | 6 +- target/arm/monitor.c | 1 - target/i386/cpu-sysemu.c | 7 +- target/i386/cpu.c | 1 - target/s390x/cpu_models_sysemu.c | 1 - tests/qtest/fuzz/qos_fuzz.c | 3 +- tests/qtest/qmp-cmd-test.c | 2 +- tests/unit/test-char.c | 1 - tests/unit/test-crypto-block.c | 6 - tests/unit/test-qmp-cmds.c | 26 ++--- tests/unit/test-qmp-event.c | 4 +- tests/unit/test-qobject-input-visitor.c | 2 +- tests/unit/test-qobject-output-visitor.c | 2 - tests/unit/test-visitor-serialization.c | 3 +- ui/console.c | 4 +- ui/input.c | 4 +- ui/spice-core.c | 5 - ui/vnc.c | 10 -- util/qemu-config.c | 17 +-- scripts/qapi/commands.py | 9 +- scripts/qapi/events.py | 3 +- scripts/qapi/gen.py | 2 +- scripts/qapi/schema.py | 14 +++ scripts/qapi/types.py | 2 +- scripts/qapi/visit.py | 17 ++- ui/cocoa.m | 11 +- 107 files changed, 511 insertions(+), 760 deletions(-)