Adding qemu as a submodule of KVMFORNFV

This Patch includes the changes to add qemu as a submodule to
kvmfornfv repo and make use of the updated latest qemu for the
execution of all testcase
Change-Id: I1280af507a857675c7f81d30c95255635667bdd7
Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>

20 files changed, 0 insertions, 6865 deletions

diff --git a/qemu/qapi/Makefile.objs b/qemu/qapi/Makefile.objs
deleted file mode 100644
index 227897069..000000000
--- a/qemu/qapi/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-util-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o
-util-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o
-util-obj-y += string-input-visitor.o string-output-visitor.o
-util-obj-y += opts-visitor.o
-util-obj-y += qmp-event.o
-util-obj-y += qapi-util.o
diff --git a/qemu/qapi/block-core.json b/qemu/qapi/block-core.json
deleted file mode 100644
index 1d09079cc..000000000
--- a/qemu/qapi/block-core.json
+++ /dev/null
@@ -1,2558 +0,0 @@
-# -*- Mode: Python -*-
-#
-# QAPI block core definitions (vm unrelated)
-
-# QAPI common definitions
-{ 'include': 'common.json' }
-
-##
-# @SnapshotInfo
-#
-# @id: unique snapshot id
-#
-# @name: user chosen name
-#
-# @vm-state-size: size of the VM state
-#
-# @date-sec: UTC date of the snapshot in seconds
-#
-# @date-nsec: fractional part in nano seconds to be used with date-sec
-#
-# @vm-clock-sec: VM clock relative to boot in seconds
-#
-# @vm-clock-nsec: fractional part in nano seconds to be used with vm-clock-sec
-#
-# Since: 1.3
-#
-##
-
-{ 'struct': 'SnapshotInfo',
-  'data': { 'id': 'str', 'name': 'str', 'vm-state-size': 'int',
-            'date-sec': 'int', 'date-nsec': 'int',
-            'vm-clock-sec': 'int', 'vm-clock-nsec': 'int' } }
-
-##
-# @ImageInfoSpecificQCow2:
-#
-# @compat: compatibility level
-#
-# @lazy-refcounts: #optional on or off; only valid for compat >= 1.1
-#
-# @corrupt: #optional true if the image has been marked corrupt; only valid for
-#           compat >= 1.1 (since 2.2)
-#
-# @refcount-bits: width of a refcount entry in bits (since 2.3)
-#
-# Since: 1.7
-##
-{ 'struct': 'ImageInfoSpecificQCow2',
-  'data': {
-      'compat': 'str',
-      '*lazy-refcounts': 'bool',
-      '*corrupt': 'bool',
-      'refcount-bits': 'int'
-  } }
-
-##
-# @ImageInfoSpecificVmdk:
-#
-# @create-type: The create type of VMDK image
-#
-# @cid: Content id of image
-#
-# @parent-cid: Parent VMDK image's cid
-#
-# @extents: List of extent files
-#
-# Since: 1.7
-##
-{ 'struct': 'ImageInfoSpecificVmdk',
-  'data': {
-      'create-type': 'str',
-      'cid': 'int',
-      'parent-cid': 'int',
-      'extents': ['ImageInfo']
-  } }
-
-##
-# @ImageInfoSpecific:
-#
-# A discriminated record of image format specific information structures.
-#
-# Since: 1.7
-##
-
-{ 'union': 'ImageInfoSpecific',
-  'data': {
-      'qcow2': 'ImageInfoSpecificQCow2',
-      'vmdk': 'ImageInfoSpecificVmdk'
-  } }
-
-##
-# @ImageInfo:
-#
-# Information about a QEMU image file
-#
-# @filename: name of the image file
-#
-# @format: format of the image file
-#
-# @virtual-size: maximum capacity in bytes of the image
-#
-# @actual-size: #optional actual size on disk in bytes of the image
-#
-# @dirty-flag: #optional true if image is not cleanly closed
-#
-# @cluster-size: #optional size of a cluster in bytes
-#
-# @encrypted: #optional true if the image is encrypted
-#
-# @compressed: #optional true if the image is compressed (Since 1.7)
-#
-# @backing-filename: #optional name of the backing file
-#
-# @full-backing-filename: #optional full path of the backing file
-#
-# @backing-filename-format: #optional the format of the backing file
-#
-# @snapshots: #optional list of VM snapshots
-#
-# @backing-image: #optional info of the backing image (since 1.6)
-#
-# @format-specific: #optional structure supplying additional format-specific
-# information (since 1.7)
-#
-# Since: 1.3
-#
-##
-
-{ 'struct': 'ImageInfo',
-  'data': {'filename': 'str', 'format': 'str', '*dirty-flag': 'bool',
-           '*actual-size': 'int', 'virtual-size': 'int',
-           '*cluster-size': 'int', '*encrypted': 'bool', '*compressed': 'bool',
-           '*backing-filename': 'str', '*full-backing-filename': 'str',
-           '*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'],
-           '*backing-image': 'ImageInfo',
-           '*format-specific': 'ImageInfoSpecific' } }
-
-##
-# @ImageCheck:
-#
-# Information about a QEMU image file check
-#
-# @filename: name of the image file checked
-#
-# @format: format of the image file checked
-#
-# @check-errors: number of unexpected errors occurred during check
-#
-# @image-end-offset: #optional offset (in bytes) where the image ends, this
-#                    field is present if the driver for the image format
-#                    supports it
-#
-# @corruptions: #optional number of corruptions found during the check if any
-#
-# @leaks: #optional number of leaks found during the check if any
-#
-# @corruptions-fixed: #optional number of corruptions fixed during the check
-#                     if any
-#
-# @leaks-fixed: #optional number of leaks fixed during the check if any
-#
-# @total-clusters: #optional total number of clusters, this field is present
-#                  if the driver for the image format supports it
-#
-# @allocated-clusters: #optional total number of allocated clusters, this
-#                      field is present if the driver for the image format
-#                      supports it
-#
-# @fragmented-clusters: #optional total number of fragmented clusters, this
-#                       field is present if the driver for the image format
-#                       supports it
-#
-# @compressed-clusters: #optional total number of compressed clusters, this
-#                       field is present if the driver for the image format
-#                       supports it
-#
-# Since: 1.4
-#
-##
-
-{ 'struct': 'ImageCheck',
-  'data': {'filename': 'str', 'format': 'str', 'check-errors': 'int',
-           '*image-end-offset': 'int', '*corruptions': 'int', '*leaks': 'int',
-           '*corruptions-fixed': 'int', '*leaks-fixed': 'int',
-           '*total-clusters': 'int', '*allocated-clusters': 'int',
-           '*fragmented-clusters': 'int', '*compressed-clusters': 'int' } }
-
-##
-# @MapEntry:
-#
-# Mapping information from a virtual block range to a host file range
-#
-# @start: the start byte of the mapped virtual range
-#
-# @length: the number of bytes of the mapped virtual range
-#
-# @data: whether the mapped range has data
-#
-# @zero: whether the virtual blocks are zeroed
-#
-# @depth: the depth of the mapping
-#
-# @offset: #optional the offset in file that the virtual sectors are mapped to
-#
-# @filename: #optional filename that is referred to by @offset
-#
-# Since: 2.6
-#
-##
-{ 'struct': 'MapEntry',
-  'data': {'start': 'int', 'length': 'int', 'data': 'bool',
-           'zero': 'bool', 'depth': 'int', '*offset': 'int',
-           '*filename': 'str' } }
-
-##
-# @BlockdevCacheInfo
-#
-# Cache mode information for a block device
-#
-# @writeback:   true if writeback mode is enabled
-# @direct:      true if the host page cache is bypassed (O_DIRECT)
-# @no-flush:    true if flush requests are ignored for the device
-#
-# Since: 2.3
-##
-{ 'struct': 'BlockdevCacheInfo',
-  'data': { 'writeback': 'bool',
-            'direct': 'bool',
-            'no-flush': 'bool' } }
-
-##
-# @BlockDeviceInfo:
-#
-# Information about the backing device for a block device.
-#
-# @file: the filename of the backing device
-#
-# @node-name: #optional the name of the block driver node (Since 2.0)
-#
-# @ro: true if the backing device was open read-only
-#
-# @drv: the name of the block format used to open the backing device. As of
-#       0.14.0 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg',
-#       'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device',
-#       'http', 'https', 'luks', 'nbd', 'parallels', 'qcow',
-#       'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat'
-#       2.2: 'archipelago' added, 'cow' dropped
-#       2.3: 'host_floppy' deprecated
-#       2.5: 'host_floppy' dropped
-#       2.6: 'luks' added
-#
-# @backing_file: #optional the name of the backing file (for copy-on-write)
-#
-# @backing_file_depth: number of files in the backing file chain (since: 1.2)
-#
-# @encrypted: true if the backing device is encrypted
-#
-# @encryption_key_missing: true if the backing device is encrypted but an
-#                          valid encryption key is missing
-#
-# @detect_zeroes: detect and optimize zero writes (Since 2.1)
-#
-# @bps: total throughput limit in bytes per second is specified
-#
-# @bps_rd: read throughput limit in bytes per second is specified
-#
-# @bps_wr: write throughput limit in bytes per second is specified
-#
-# @iops: total I/O operations per second is specified
-#
-# @iops_rd: read I/O operations per second is specified
-#
-# @iops_wr: write I/O operations per second is specified
-#
-# @image: the info of image used (since: 1.6)
-#
-# @bps_max: #optional total throughput limit during bursts,
-#                     in bytes (Since 1.7)
-#
-# @bps_rd_max: #optional read throughput limit during bursts,
-#                        in bytes (Since 1.7)
-#
-# @bps_wr_max: #optional write throughput limit during bursts,
-#                        in bytes (Since 1.7)
-#
-# @iops_max: #optional total I/O operations per second during bursts,
-#                      in bytes (Since 1.7)
-#
-# @iops_rd_max: #optional read I/O operations per second during bursts,
-#                         in bytes (Since 1.7)
-#
-# @iops_wr_max: #optional write I/O operations per second during bursts,
-#                         in bytes (Since 1.7)
-#
-# @bps_max_length: #optional maximum length of the @bps_max burst
-#                            period, in seconds. (Since 2.6)
-#
-# @bps_rd_max_length: #optional maximum length of the @bps_rd_max
-#                               burst period, in seconds. (Since 2.6)
-#
-# @bps_wr_max_length: #optional maximum length of the @bps_wr_max
-#                               burst period, in seconds. (Since 2.6)
-#
-# @iops_max_length: #optional maximum length of the @iops burst
-#                             period, in seconds. (Since 2.6)
-#
-# @iops_rd_max_length: #optional maximum length of the @iops_rd_max
-#                                burst period, in seconds. (Since 2.6)
-#
-# @iops_wr_max_length: #optional maximum length of the @iops_wr_max
-#                                burst period, in seconds. (Since 2.6)
-#
-# @iops_size: #optional an I/O size in bytes (Since 1.7)
-#
-# @group: #optional throttle group name (Since 2.4)
-#
-# @cache: the cache mode used for the block device (since: 2.3)
-#
-# @write_threshold: configured write threshold for the device.
-#                   0 if disabled. (Since 2.3)
-#
-# Since: 0.14.0
-#
-##
-{ 'struct': 'BlockDeviceInfo',
-  'data': { 'file': 'str', '*node-name': 'str', 'ro': 'bool', 'drv': 'str',
-            '*backing_file': 'str', 'backing_file_depth': 'int',
-            'encrypted': 'bool', 'encryption_key_missing': 'bool',
-            'detect_zeroes': 'BlockdevDetectZeroesOptions',
-            'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int',
-            'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int',
-            'image': 'ImageInfo',
-            '*bps_max': 'int', '*bps_rd_max': 'int',
-            '*bps_wr_max': 'int', '*iops_max': 'int',
-            '*iops_rd_max': 'int', '*iops_wr_max': 'int',
-            '*bps_max_length': 'int', '*bps_rd_max_length': 'int',
-            '*bps_wr_max_length': 'int', '*iops_max_length': 'int',
-            '*iops_rd_max_length': 'int', '*iops_wr_max_length': 'int',
-            '*iops_size': 'int', '*group': 'str', 'cache': 'BlockdevCacheInfo',
-            'write_threshold': 'int' } }
-
-##
-# @BlockDeviceIoStatus:
-#
-# An enumeration of block device I/O status.
-#
-# @ok: The last I/O operation has succeeded
-#
-# @failed: The last I/O operation has failed
-#
-# @nospace: The last I/O operation has failed due to a no-space condition
-#
-# Since: 1.0
-##
-{ 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'failed', 'nospace' ] }
-
-##
-# @BlockDeviceMapEntry:
-#
-# Entry in the metadata map of the device (returned by "qemu-img map")
-#
-# @start: Offset in the image of the first byte described by this entry
-#         (in bytes)
-#
-# @length: Length of the range described by this entry (in bytes)
-#
-# @depth: Number of layers (0 = top image, 1 = top image's backing file, etc.)
-#         before reaching one for which the range is allocated.  The value is
-#         in the range 0 to the depth of the image chain - 1.
-#
-# @zero: the sectors in this range read as zeros
-#
-# @data: reading the image will actually read data from a file (in particular,
-#        if @offset is present this means that the sectors are not simply
-#        preallocated, but contain actual data in raw format)
-#
-# @offset: if present, the image file stores the data for this range in
-#          raw format at the given offset.
-#
-# Since 1.7
-##
-{ 'struct': 'BlockDeviceMapEntry',
-  'data': { 'start': 'int', 'length': 'int', 'depth': 'int', 'zero': 'bool',
-            'data': 'bool', '*offset': 'int' } }
-
-##
-# @DirtyBitmapStatus:
-#
-# An enumeration of possible states that a dirty bitmap can report to the user.
-#
-# @frozen: The bitmap is currently in-use by a backup operation or block job,
-#          and is immutable.
-#
-# @disabled: The bitmap is currently in-use by an internal operation and is
-#            read-only. It can still be deleted.
-#
-# @active: The bitmap is actively monitoring for new writes, and can be cleared,
-#          deleted, or used for backup operations.
-#
-# Since: 2.4
-##
-{ 'enum': 'DirtyBitmapStatus',
-  'data': ['active', 'disabled', 'frozen'] }
-
-##
-# @BlockDirtyInfo:
-#
-# Block dirty bitmap information.
-#
-# @name: #optional the name of the dirty bitmap (Since 2.4)
-#
-# @count: number of dirty bytes according to the dirty bitmap
-#
-# @granularity: granularity of the dirty bitmap in bytes (since 1.4)
-#
-# @status: current status of the dirty bitmap (since 2.4)
-#
-# Since: 1.3
-##
-{ 'struct': 'BlockDirtyInfo',
-  'data': {'*name': 'str', 'count': 'int', 'granularity': 'uint32',
-           'status': 'DirtyBitmapStatus'} }
-
-##
-# @BlockInfo:
-#
-# Block device information.  This structure describes a virtual device and
-# the backing device associated with it.
-#
-# @device: The device name associated with the virtual device.
-#
-# @type: This field is returned only for compatibility reasons, it should
-#        not be used (always returns 'unknown')
-#
-# @removable: True if the device supports removable media.
-#
-# @locked: True if the guest has locked this device from having its media
-#          removed
-#
-# @tray_open: #optional True if the device's tray is open
-#             (only present if it has a tray)
-#
-# @dirty-bitmaps: #optional dirty bitmaps information (only present if the
-#                 driver has one or more dirty bitmaps) (Since 2.0)
-#
-# @io-status: #optional @BlockDeviceIoStatus. Only present if the device
-#             supports it and the VM is configured to stop on errors
-#             (supported device models: virtio-blk, ide, scsi-disk)
-#
-# @inserted: #optional @BlockDeviceInfo describing the device if media is
-#            present
-#
-# Since:  0.14.0
-##
-{ 'struct': 'BlockInfo',
-  'data': {'device': 'str', 'type': 'str', 'removable': 'bool',
-           'locked': 'bool', '*inserted': 'BlockDeviceInfo',
-           '*tray_open': 'bool', '*io-status': 'BlockDeviceIoStatus',
-           '*dirty-bitmaps': ['BlockDirtyInfo'] } }
-
-##
-# @query-block:
-#
-# Get a list of BlockInfo for all virtual block devices.
-#
-# Returns: a list of @BlockInfo describing each virtual block device
-#
-# Since: 0.14.0
-##
-{ 'command': 'query-block', 'returns': ['BlockInfo'] }
-
-
-##
-# @BlockDeviceTimedStats:
-#
-# Statistics of a block device during a given interval of time.
-#
-# @interval_length: Interval used for calculating the statistics,
-#                   in seconds.
-#
-# @min_rd_latency_ns: Minimum latency of read operations in the
-#                     defined interval, in nanoseconds.
-#
-# @min_wr_latency_ns: Minimum latency of write operations in the
-#                     defined interval, in nanoseconds.
-#
-# @min_flush_latency_ns: Minimum latency of flush operations in the
-#                        defined interval, in nanoseconds.
-#
-# @max_rd_latency_ns: Maximum latency of read operations in the
-#                     defined interval, in nanoseconds.
-#
-# @max_wr_latency_ns: Maximum latency of write operations in the
-#                     defined interval, in nanoseconds.
-#
-# @max_flush_latency_ns: Maximum latency of flush operations in the
-#                        defined interval, in nanoseconds.
-#
-# @avg_rd_latency_ns: Average latency of read operations in the
-#                     defined interval, in nanoseconds.
-#
-# @avg_wr_latency_ns: Average latency of write operations in the
-#                     defined interval, in nanoseconds.
-#
-# @avg_flush_latency_ns: Average latency of flush operations in the
-#                        defined interval, in nanoseconds.
-#
-# @avg_rd_queue_depth: Average number of pending read operations
-#                      in the defined interval.
-#
-# @avg_wr_queue_depth: Average number of pending write operations
-#                      in the defined interval.
-#
-# Since: 2.5
-##
-
-{ 'struct': 'BlockDeviceTimedStats',
-  'data': { 'interval_length': 'int', 'min_rd_latency_ns': 'int',
-            'max_rd_latency_ns': 'int', 'avg_rd_latency_ns': 'int',
-            'min_wr_latency_ns': 'int', 'max_wr_latency_ns': 'int',
-            'avg_wr_latency_ns': 'int', 'min_flush_latency_ns': 'int',
-            'max_flush_latency_ns': 'int', 'avg_flush_latency_ns': 'int',
-            'avg_rd_queue_depth': 'number', 'avg_wr_queue_depth': 'number' } }
-
-##
-# @BlockDeviceStats:
-#
-# Statistics of a virtual block device or a block backing device.
-#
-# @rd_bytes:      The number of bytes read by the device.
-#
-# @wr_bytes:      The number of bytes written by the device.
-#
-# @rd_operations: The number of read operations performed by the device.
-#
-# @wr_operations: The number of write operations performed by the device.
-#
-# @flush_operations: The number of cache flush operations performed by the
-#                    device (since 0.15.0)
-#
-# @flush_total_time_ns: Total time spend on cache flushes in nano-seconds
-#                       (since 0.15.0).
-#
-# @wr_total_time_ns: Total time spend on writes in nano-seconds (since 0.15.0).
-#
-# @rd_total_time_ns: Total_time_spend on reads in nano-seconds (since 0.15.0).
-#
-# @wr_highest_offset: The offset after the greatest byte written to the
-#                     device.  The intended use of this information is for
-#                     growable sparse files (like qcow2) that are used on top
-#                     of a physical device.
-#
-# @rd_merged: Number of read requests that have been merged into another
-#             request (Since 2.3).
-#
-# @wr_merged: Number of write requests that have been merged into another
-#             request (Since 2.3).
-#
-# @idle_time_ns: #optional Time since the last I/O operation, in
-#                nanoseconds. If the field is absent it means that
-#                there haven't been any operations yet (Since 2.5).
-#
-# @failed_rd_operations: The number of failed read operations
-#                        performed by the device (Since 2.5)
-#
-# @failed_wr_operations: The number of failed write operations
-#                        performed by the device (Since 2.5)
-#
-# @failed_flush_operations: The number of failed flush operations
-#                           performed by the device (Since 2.5)
-#
-# @invalid_rd_operations: The number of invalid read operations
-#                          performed by the device (Since 2.5)
-#
-# @invalid_wr_operations: The number of invalid write operations
-#                         performed by the device (Since 2.5)
-#
-# @invalid_flush_operations: The number of invalid flush operations
-#                            performed by the device (Since 2.5)
-#
-# @account_invalid: Whether invalid operations are included in the
-#                   last access statistics (Since 2.5)
-#
-# @account_failed: Whether failed operations are included in the
-#                  latency and last access statistics (Since 2.5)
-#
-# @timed_stats: Statistics specific to the set of previously defined
-#               intervals of time (Since 2.5)
-#
-# Since: 0.14.0
-##
-{ 'struct': 'BlockDeviceStats',
-  'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'rd_operations': 'int',
-           'wr_operations': 'int', 'flush_operations': 'int',
-           'flush_total_time_ns': 'int', 'wr_total_time_ns': 'int',
-           'rd_total_time_ns': 'int', 'wr_highest_offset': 'int',
-           'rd_merged': 'int', 'wr_merged': 'int', '*idle_time_ns': 'int',
-           'failed_rd_operations': 'int', 'failed_wr_operations': 'int',
-           'failed_flush_operations': 'int', 'invalid_rd_operations': 'int',
-           'invalid_wr_operations': 'int', 'invalid_flush_operations': 'int',
-           'account_invalid': 'bool', 'account_failed': 'bool',
-           'timed_stats': ['BlockDeviceTimedStats'] } }
-
-##
-# @BlockStats:
-#
-# Statistics of a virtual block device or a block backing device.
-#
-# @device: #optional If the stats are for a virtual block device, the name
-#          corresponding to the virtual block device.
-#
-# @node-name: #optional The node name of the device. (Since 2.3)
-#
-# @stats:  A @BlockDeviceStats for the device.
-#
-# @parent: #optional This describes the file block device if it has one.
-#
-# @backing: #optional This describes the backing block device if it has one.
-#           (Since 2.0)
-#
-# Since: 0.14.0
-##
-{ 'struct': 'BlockStats',
-  'data': {'*device': 'str', '*node-name': 'str',
-           'stats': 'BlockDeviceStats',
-           '*parent': 'BlockStats',
-           '*backing': 'BlockStats'} }
-
-##
-# @query-blockstats:
-#
-# Query the @BlockStats for all virtual block devices.
-#
-# @query-nodes: #optional If true, the command will query all the block nodes
-#               that have a node name, in a list which will include "parent"
-#               information, but not "backing".
-#               If false or omitted, the behavior is as before - query all the
-#               device backends, recursively including their "parent" and
-#               "backing". (Since 2.3)
-#
-# Returns: A list of @BlockStats for each virtual block devices.
-#
-# Since: 0.14.0
-##
-{ 'command': 'query-blockstats',
-  'data': { '*query-nodes': 'bool' },
-  'returns': ['BlockStats'] }
-
-##
-# @BlockdevOnError:
-#
-# An enumeration of possible behaviors for errors on I/O operations.
-# The exact meaning depends on whether the I/O was initiated by a guest
-# or by a block job
-#
-# @report: for guest operations, report the error to the guest;
-#          for jobs, cancel the job
-#
-# @ignore: ignore the error, only report a QMP event (BLOCK_IO_ERROR
-#          or BLOCK_JOB_ERROR)
-#
-# @enospc: same as @stop on ENOSPC, same as @report otherwise.
-#
-# @stop: for guest operations, stop the virtual machine;
-#        for jobs, pause the job
-#
-# Since: 1.3
-##
-{ 'enum': 'BlockdevOnError',
-  'data': ['report', 'ignore', 'enospc', 'stop'] }
-
-##
-# @MirrorSyncMode:
-#
-# An enumeration of possible behaviors for the initial synchronization
-# phase of storage mirroring.
-#
-# @top: copies data in the topmost image to the destination
-#
-# @full: copies data from all images to the destination
-#
-# @none: only copy data written from now on
-#
-# @incremental: only copy data described by the dirty bitmap. Since: 2.4
-#
-# Since: 1.3
-##
-{ 'enum': 'MirrorSyncMode',
-  'data': ['top', 'full', 'none', 'incremental'] }
-
-##
-# @BlockJobType:
-#
-# Type of a block job.
-#
-# @commit: block commit job type, see "block-commit"
-#
-# @stream: block stream job type, see "block-stream"
-#
-# @mirror: drive mirror job type, see "drive-mirror"
-#
-# @backup: drive backup job type, see "drive-backup"
-#
-# Since: 1.7
-##
-{ 'enum': 'BlockJobType',
-  'data': ['commit', 'stream', 'mirror', 'backup'] }
-
-##
-# @BlockJobInfo:
-#
-# Information about a long-running block device operation.
-#
-# @type: the job type ('stream' for image streaming)
-#
-# @device: the block device name
-#
-# @len: the maximum progress value
-#
-# @busy: false if the job is known to be in a quiescent state, with
-#        no pending I/O.  Since 1.3.
-#
-# @paused: whether the job is paused or, if @busy is true, will
-#          pause itself as soon as possible.  Since 1.3.
-#
-# @offset: the current progress value
-#
-# @speed: the rate limit, bytes per second
-#
-# @io-status: the status of the job (since 1.3)
-#
-# @ready: true if the job may be completed (since 2.2)
-#
-# Since: 1.1
-##
-{ 'struct': 'BlockJobInfo',
-  'data': {'type': 'str', 'device': 'str', 'len': 'int',
-           'offset': 'int', 'busy': 'bool', 'paused': 'bool', 'speed': 'int',
-           'io-status': 'BlockDeviceIoStatus', 'ready': 'bool'} }
-
-##
-# @query-block-jobs:
-#
-# Return information about long-running block device operations.
-#
-# Returns: a list of @BlockJobInfo for each active block job
-#
-# Since: 1.1
-##
-{ 'command': 'query-block-jobs', 'returns': ['BlockJobInfo'] }
-
-##
-# @block_passwd:
-#
-# This command sets the password of a block device that has not been open
-# with a password and requires one.
-#
-# The two cases where this can happen are a block device is created through
-# QEMU's initial command line or a block device is changed through the legacy
-# @change interface.
-#
-# In the event that the block device is created through the initial command
-# line, the VM will start in the stopped state regardless of whether '-S' is
-# used.  The intention is for a management tool to query the block devices to
-# determine which ones are encrypted, set the passwords with this command, and
-# then start the guest with the @cont command.
-#
-# Either @device or @node-name must be set but not both.
-#
-# @device: #optional the name of the block backend device to set the password on
-#
-# @node-name: #optional graph node name to set the password on (Since 2.0)
-#
-# @password: the password to use for the device
-#
-# Returns: nothing on success
-#          If @device is not a valid block device, DeviceNotFound
-#          If @device is not encrypted, DeviceNotEncrypted
-#
-# Notes:  Not all block formats support encryption and some that do are not
-#         able to validate that a password is correct.  Disk corruption may
-#         occur if an invalid password is specified.
-#
-# Since: 0.14.0
-##
-{ 'command': 'block_passwd', 'data': {'*device': 'str',
-                                      '*node-name': 'str', 'password': 'str'} }
-
-##
-# @block_resize
-#
-# Resize a block image while a guest is running.
-#
-# Either @device or @node-name must be set but not both.
-#
-# @device: #optional the name of the device to get the image resized
-#
-# @node-name: #optional graph node name to get the image resized (Since 2.0)
-#
-# @size:  new image size in bytes
-#
-# Returns: nothing on success
-#          If @device is not a valid block device, DeviceNotFound
-#
-# Since: 0.14.0
-##
-{ 'command': 'block_resize', 'data': { '*device': 'str',
-                                       '*node-name': 'str',
-                                       'size': 'int' }}
-
-##
-# @NewImageMode
-#
-# An enumeration that tells QEMU how to set the backing file path in
-# a new image file.
-#
-# @existing: QEMU should look for an existing image file.
-#
-# @absolute-paths: QEMU should create a new image with absolute paths
-# for the backing file. If there is no backing file available, the new
-# image will not be backed either.
-#
-# Since: 1.1
-##
-{ 'enum': 'NewImageMode',
-  'data': [ 'existing', 'absolute-paths' ] }
-
-##
-# @BlockdevSnapshotSync
-#
-# Either @device or @node-name must be set but not both.
-#
-# @device: #optional the name of the device to generate the snapshot from.
-#
-# @node-name: #optional graph node name to generate the snapshot from (Since 2.0)
-#
-# @snapshot-file: the target of the new image. A new file will be created.
-#
-# @snapshot-node-name: #optional the graph node name of the new image (Since 2.0)
-#
-# @format: #optional the format of the snapshot image, default is 'qcow2'.
-#
-# @mode: #optional whether and how QEMU should create a new image, default is
-#        'absolute-paths'.
-##
-{ 'struct': 'BlockdevSnapshotSync',
-  'data': { '*device': 'str', '*node-name': 'str',
-            'snapshot-file': 'str', '*snapshot-node-name': 'str',
-            '*format': 'str', '*mode': 'NewImageMode' } }
-
-##
-# @BlockdevSnapshot
-#
-# @node: device or node name that will have a snapshot created.
-#
-# @overlay: reference to the existing block device that will become
-#           the overlay of @node, as part of creating the snapshot.
-#           It must not have a current backing file (this can be
-#           achieved by passing "backing": "" to blockdev-add).
-#
-# Since 2.5
-##
-{ 'struct': 'BlockdevSnapshot',
-  'data': { 'node': 'str', 'overlay': 'str' } }
-
-##
-# @DriveBackup
-#
-# @device: the name of the device which should be copied.
-#
-# @target: the target of the new image. If the file exists, or if it
-#          is a device, the existing file/device will be used as the new
-#          destination.  If it does not exist, a new file will be created.
-#
-# @format: #optional the format of the new destination, default is to
-#          probe if @mode is 'existing', else the format of the source
-#
-# @sync: what parts of the disk image should be copied to the destination
-#        (all the disk, only the sectors allocated in the topmost image, from a
-#        dirty bitmap, or only new I/O).
-#
-# @mode: #optional whether and how QEMU should create a new image, default is
-#        'absolute-paths'.
-#
-# @speed: #optional the maximum speed, in bytes per second
-#
-# @bitmap: #optional the name of dirty bitmap if sync is "incremental".
-#          Must be present if sync is "incremental", must NOT be present
-#          otherwise. (Since 2.4)
-#
-# @on-source-error: #optional the action to take on an error on the source,
-#                   default 'report'.  'stop' and 'enospc' can only be used
-#                   if the block device supports io-status (see BlockInfo).
-#
-# @on-target-error: #optional the action to take on an error on the target,
-#                   default 'report' (no limitations, since this applies to
-#                   a different block device than @device).
-#
-# Note that @on-source-error and @on-target-error only affect background I/O.
-# If an error occurs during a guest write request, the device's rerror/werror
-# actions will be used.
-#
-# Since: 1.6
-##
-{ 'struct': 'DriveBackup',
-  'data': { 'device': 'str', 'target': 'str', '*format': 'str',
-            'sync': 'MirrorSyncMode', '*mode': 'NewImageMode',
-            '*speed': 'int', '*bitmap': 'str',
-            '*on-source-error': 'BlockdevOnError',
-            '*on-target-error': 'BlockdevOnError' } }
-
-##
-# @BlockdevBackup
-#
-# @device: the name of the device which should be copied.
-#
-# @target: the name of the backup target device.
-#
-# @sync: what parts of the disk image should be copied to the destination
-#        (all the disk, only the sectors allocated in the topmost image, or
-#        only new I/O).
-#
-# @speed: #optional the maximum speed, in bytes per second. The default is 0,
-#         for unlimited.
-#
-# @on-source-error: #optional the action to take on an error on the source,
-#                   default 'report'.  'stop' and 'enospc' can only be used
-#                   if the block device supports io-status (see BlockInfo).
-#
-# @on-target-error: #optional the action to take on an error on the target,
-#                   default 'report' (no limitations, since this applies to
-#                   a different block device than @device).
-#
-# Note that @on-source-error and @on-target-error only affect background I/O.
-# If an error occurs during a guest write request, the device's rerror/werror
-# actions will be used.
-#
-# Since: 2.3
-##
-{ 'struct': 'BlockdevBackup',
-  'data': { 'device': 'str', 'target': 'str',
-            'sync': 'MirrorSyncMode',
-            '*speed': 'int',
-            '*on-source-error': 'BlockdevOnError',
-            '*on-target-error': 'BlockdevOnError' } }
-
-##
-# @blockdev-snapshot-sync
-#
-# Generates a synchronous snapshot of a block device.
-#
-# For the arguments, see the documentation of BlockdevSnapshotSync.
-#
-# Returns: nothing on success
-#          If @device is not a valid block device, DeviceNotFound
-#
-# Since 0.14.0
-##
-{ 'command': 'blockdev-snapshot-sync',
-  'data': 'BlockdevSnapshotSync' }
-
-
-##
-# @blockdev-snapshot
-#
-# Generates a snapshot of a block device.
-#
-# For the arguments, see the documentation of BlockdevSnapshot.
-#
-# Since 2.5
-##
-{ 'command': 'blockdev-snapshot',
-  'data': 'BlockdevSnapshot' }
-
-##
-# @change-backing-file
-#
-# Change the backing file in the image file metadata.  This does not
-# cause QEMU to reopen the image file to reparse the backing filename
-# (it may, however, perform a reopen to change permissions from
-# r/o -> r/w -> r/o, if needed). The new backing file string is written
-# into the image file metadata, and the QEMU internal strings are
-# updated.
-#
-# @image-node-name: The name of the block driver state node of the
-#                   image to modify.
-#
-# @device:          The name of the device that owns image-node-name.
-#
-# @backing-file:    The string to write as the backing file.  This
-#                   string is not validated, so care should be taken
-#                   when specifying the string or the image chain may
-#                   not be able to be reopened again.
-#
-# Since: 2.1
-##
-{ 'command': 'change-backing-file',
-  'data': { 'device': 'str', 'image-node-name': 'str',
-            'backing-file': 'str' } }
-
-##
-# @block-commit
-#
-# Live commit of data from overlay image nodes into backing nodes - i.e.,
-# writes data between 'top' and 'base' into 'base'.
-#
-# @device:  the name of the device
-#
-# @base:   #optional The file name of the backing image to write data into.
-#                    If not specified, this is the deepest backing image
-#
-# @top:    #optional The file name of the backing image within the image chain,
-#                    which contains the topmost data to be committed down. If
-#                    not specified, this is the active layer.
-#
-# @backing-file:  #optional The backing file string to write into the overlay
-#                           image of 'top'.  If 'top' is the active layer,
-#                           specifying a backing file string is an error. This
-#                           filename is not validated.
-#
-#                           If a pathname string is such that it cannot be
-#                           resolved by QEMU, that means that subsequent QMP or
-#                           HMP commands must use node-names for the image in
-#                           question, as filename lookup methods will fail.
-#
-#                           If not specified, QEMU will automatically determine
-#                           the backing file string to use, or error out if
-#                           there is no obvious choice. Care should be taken
-#                           when specifying the string, to specify a valid
-#                           filename or protocol.
-#                           (Since 2.1)
-#
-#                    If top == base, that is an error.
-#                    If top == active, the job will not be completed by itself,
-#                    user needs to complete the job with the block-job-complete
-#                    command after getting the ready event. (Since 2.0)
-#
-#                    If the base image is smaller than top, then the base image
-#                    will be resized to be the same size as top.  If top is
-#                    smaller than the base image, the base will not be
-#                    truncated.  If you want the base image size to match the
-#                    size of the smaller top, you can safely truncate it
-#                    yourself once the commit operation successfully completes.
-#
-# @speed:  #optional the maximum speed, in bytes per second
-#
-# Returns: Nothing on success
-#          If commit or stream is already active on this device, DeviceInUse
-#          If @device does not exist, DeviceNotFound
-#          If image commit is not supported by this device, NotSupported
-#          If @base or @top is invalid, a generic error is returned
-#          If @speed is invalid, InvalidParameter
-#
-# Since: 1.3
-#
-##
-{ 'command': 'block-commit',
-  'data': { 'device': 'str', '*base': 'str', '*top': 'str',
-            '*backing-file': 'str', '*speed': 'int' } }
-
-##
-# @drive-backup
-#
-# Start a point-in-time copy of a block device to a new destination.  The
-# status of ongoing drive-backup operations can be checked with
-# query-block-jobs where the BlockJobInfo.type field has the value 'backup'.
-# The operation can be stopped before it has completed using the
-# block-job-cancel command.
-#
-# For the arguments, see the documentation of DriveBackup.
-#
-# Returns: nothing on success
-#          If @device is not a valid block device, DeviceNotFound
-#
-# Since 1.6
-##
-{ 'command': 'drive-backup', 'data': 'DriveBackup' }
-
-##
-# @blockdev-backup
-#
-# Start a point-in-time copy of a block device to a new destination.  The
-# status of ongoing blockdev-backup operations can be checked with
-# query-block-jobs where the BlockJobInfo.type field has the value 'backup'.
-# The operation can be stopped before it has completed using the
-# block-job-cancel command.
-#
-# For the arguments, see the documentation of BlockdevBackup.
-#
-# Since 2.3
-##
-{ 'command': 'blockdev-backup', 'data': 'BlockdevBackup' }
-
-
-##
-# @query-named-block-nodes
-#
-# Get the named block driver list
-#
-# Returns: the list of BlockDeviceInfo
-#
-# Since 2.0
-##
-{ 'command': 'query-named-block-nodes', 'returns': [ 'BlockDeviceInfo' ] }
-
-##
-# @drive-mirror
-#
-# Start mirroring a block device's writes to a new destination.
-#
-# @device:  the name of the device whose writes should be mirrored.
-#
-# @target: the target of the new image. If the file exists, or if it
-#          is a device, the existing file/device will be used as the new
-#          destination.  If it does not exist, a new file will be created.
-#
-# @format: #optional the format of the new destination, default is to
-#          probe if @mode is 'existing', else the format of the source
-#
-# @node-name: #optional the new block driver state node name in the graph
-#             (Since 2.1)
-#
-# @replaces: #optional with sync=full graph node name to be replaced by the new
-#            image when a whole image copy is done. This can be used to repair
-#            broken Quorum files. (Since 2.1)
-#
-# @mode: #optional whether and how QEMU should create a new image, default is
-#        'absolute-paths'.
-#
-# @speed:  #optional the maximum speed, in bytes per second
-#
-# @sync: what parts of the disk image should be copied to the destination
-#        (all the disk, only the sectors allocated in the topmost image, or
-#        only new I/O).
-#
-# @granularity: #optional granularity of the dirty bitmap, default is 64K
-#               if the image format doesn't have clusters, 4K if the clusters
-#               are smaller than that, else the cluster size.  Must be a
-#               power of 2 between 512 and 64M (since 1.4).
-#
-# @buf-size: #optional maximum amount of data in flight from source to
-#            target (since 1.4).
-#
-# @on-source-error: #optional the action to take on an error on the source,
-#                   default 'report'.  'stop' and 'enospc' can only be used
-#                   if the block device supports io-status (see BlockInfo).
-#
-# @on-target-error: #optional the action to take on an error on the target,
-#                   default 'report' (no limitations, since this applies to
-#                   a different block device than @device).
-# @unmap: #optional Whether to try to unmap target sectors where source has
-#         only zero. If true, and target unallocated sectors will read as zero,
-#         target image sectors will be unmapped; otherwise, zeroes will be
-#         written. Both will result in identical contents.
-#         Default is true. (Since 2.4)
-#
-# Returns: nothing on success
-#          If @device is not a valid block device, DeviceNotFound
-#
-# Since 1.3
-##
-{ 'command': 'drive-mirror',
-  'data': { 'device': 'str', 'target': 'str', '*format': 'str',
-            '*node-name': 'str', '*replaces': 'str',
-            'sync': 'MirrorSyncMode', '*mode': 'NewImageMode',
-            '*speed': 'int', '*granularity': 'uint32',
-            '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
-            '*on-target-error': 'BlockdevOnError',
-            '*unmap': 'bool' } }
-
-##
-# @BlockDirtyBitmap
-#
-# @node: name of device/node which the bitmap is tracking
-#
-# @name: name of the dirty bitmap
-#
-# Since 2.4
-##
-{ 'struct': 'BlockDirtyBitmap',
-  'data': { 'node': 'str', 'name': 'str' } }
-
-##
-# @BlockDirtyBitmapAdd
-#
-# @node: name of device/node which the bitmap is tracking
-#
-# @name: name of the dirty bitmap
-#
-# @granularity: #optional the bitmap granularity, default is 64k for
-#               block-dirty-bitmap-add
-#
-# Since 2.4
-##
-{ 'struct': 'BlockDirtyBitmapAdd',
-  'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32' } }
-
-##
-# @block-dirty-bitmap-add
-#
-# Create a dirty bitmap with a name on the node
-#
-# Returns: nothing on success
-#          If @node is not a valid block device or node, DeviceNotFound
-#          If @name is already taken, GenericError with an explanation
-#
-# Since 2.4
-##
-{ 'command': 'block-dirty-bitmap-add',
-  'data': 'BlockDirtyBitmapAdd' }
-
-##
-# @block-dirty-bitmap-remove
-#
-# Remove a dirty bitmap on the node
-#
-# Returns: nothing on success
-#          If @node is not a valid block device or node, DeviceNotFound
-#          If @name is not found, GenericError with an explanation
-#          if @name is frozen by an operation, GenericError
-#
-# Since 2.4
-##
-{ 'command': 'block-dirty-bitmap-remove',
-  'data': 'BlockDirtyBitmap' }
-
-##
-# @block-dirty-bitmap-clear
-#
-# Clear (reset) a dirty bitmap on the device
-#
-# Returns: nothing on success
-#          If @node is not a valid block device, DeviceNotFound
-#          If @name is not found, GenericError with an explanation
-#
-# Since 2.4
-##
-{ 'command': 'block-dirty-bitmap-clear',
-  'data': 'BlockDirtyBitmap' }
-
-##
-# @blockdev-mirror
-#
-# Start mirroring a block device's writes to a new destination.
-#
-# @device: the name of the device whose writes should be mirrored.
-#
-# @target: the id or node-name of the block device to mirror to. This mustn't be
-#          attached to guest.
-#
-# @replaces: #optional with sync=full graph node name to be replaced by the new
-#            image when a whole image copy is done. This can be used to repair
-#            broken Quorum files.
-#
-# @speed:  #optional the maximum speed, in bytes per second
-#
-# @sync: what parts of the disk image should be copied to the destination
-#        (all the disk, only the sectors allocated in the topmost image, or
-#        only new I/O).
-#
-# @granularity: #optional granularity of the dirty bitmap, default is 64K
-#               if the image format doesn't have clusters, 4K if the clusters
-#               are smaller than that, else the cluster size.  Must be a
-#               power of 2 between 512 and 64M
-#
-# @buf-size: #optional maximum amount of data in flight from source to
-#            target
-#
-# @on-source-error: #optional the action to take on an error on the source,
-#                   default 'report'.  'stop' and 'enospc' can only be used
-#                   if the block device supports io-status (see BlockInfo).
-#
-# @on-target-error: #optional the action to take on an error on the target,
-#                   default 'report' (no limitations, since this applies to
-#                   a different block device than @device).
-#
-# Returns: nothing on success.
-#
-# Since 2.6
-##
-{ 'command': 'blockdev-mirror',
-  'data': { 'device': 'str', 'target': 'str',
-            '*replaces': 'str',
-            'sync': 'MirrorSyncMode',
-            '*speed': 'int', '*granularity': 'uint32',
-            '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
-            '*on-target-error': 'BlockdevOnError' } }
-
-##
-# @block_set_io_throttle:
-#
-# Change I/O throttle limits for a block drive.
-#
-# Since QEMU 2.4, each device with I/O limits is member of a throttle
-# group.
-#
-# If two or more devices are members of the same group, the limits
-# will apply to the combined I/O of the whole group in a round-robin
-# fashion. Therefore, setting new I/O limits to a device will affect
-# the whole group.
-#
-# The name of the group can be specified using the 'group' parameter.
-# If the parameter is unset, it is assumed to be the current group of
-# that device. If it's not in any group yet, the name of the device
-# will be used as the name for its group.
-#
-# The 'group' parameter can also be used to move a device to a
-# different group. In this case the limits specified in the parameters
-# will be applied to the new group only.
-#
-# I/O limits can be disabled by setting all of them to 0. In this case
-# the device will be removed from its group and the rest of its
-# members will not be affected. The 'group' parameter is ignored.
-#
-# @device: The name of the device
-#
-# @bps: total throughput limit in bytes per second
-#
-# @bps_rd: read throughput limit in bytes per second
-#
-# @bps_wr: write throughput limit in bytes per second
-#
-# @iops: total I/O operations per second
-#
-# @iops_rd: read I/O operations per second
-#
-# @iops_wr: write I/O operations per second
-#
-# @bps_max: #optional total throughput limit during bursts,
-#                     in bytes (Since 1.7)
-#
-# @bps_rd_max: #optional read throughput limit during bursts,
-#                        in bytes (Since 1.7)
-#
-# @bps_wr_max: #optional write throughput limit during bursts,
-#                        in bytes (Since 1.7)
-#
-# @iops_max: #optional total I/O operations per second during bursts,
-#                      in bytes (Since 1.7)
-#
-# @iops_rd_max: #optional read I/O operations per second during bursts,
-#                         in bytes (Since 1.7)
-#
-# @iops_wr_max: #optional write I/O operations per second during bursts,
-#                         in bytes (Since 1.7)
-#
-# @bps_max_length: #optional maximum length of the @bps_max burst
-#                            period, in seconds. It must only
-#                            be set if @bps_max is set as well.
-#                            Defaults to 1. (Since 2.6)
-#
-# @bps_rd_max_length: #optional maximum length of the @bps_rd_max
-#                               burst period, in seconds. It must only
-#                               be set if @bps_rd_max is set as well.
-#                               Defaults to 1. (Since 2.6)
-#
-# @bps_wr_max_length: #optional maximum length of the @bps_wr_max
-#                               burst period, in seconds. It must only
-#                               be set if @bps_wr_max is set as well.
-#                               Defaults to 1. (Since 2.6)
-#
-# @iops_max_length: #optional maximum length of the @iops burst
-#                             period, in seconds. It must only
-#                             be set if @iops_max is set as well.
-#                             Defaults to 1. (Since 2.6)
-#
-# @iops_rd_max_length: #optional maximum length of the @iops_rd_max
-#                                burst period, in seconds. It must only
-#                                be set if @iops_rd_max is set as well.
-#                                Defaults to 1. (Since 2.6)
-#
-# @iops_wr_max_length: #optional maximum length of the @iops_wr_max
-#                                burst period, in seconds. It must only
-#                                be set if @iops_wr_max is set as well.
-#                                Defaults to 1. (Since 2.6)
-#
-# @iops_size: #optional an I/O size in bytes (Since 1.7)
-#
-# @group: #optional throttle group name (Since 2.4)
-#
-# Returns: Nothing on success
-#          If @device is not a valid block device, DeviceNotFound
-#
-# Since: 1.1
-##
-{ 'command': 'block_set_io_throttle',
-  'data': { 'device': 'str', 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int',
-            'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int',
-            '*bps_max': 'int', '*bps_rd_max': 'int',
-            '*bps_wr_max': 'int', '*iops_max': 'int',
-            '*iops_rd_max': 'int', '*iops_wr_max': 'int',
-            '*bps_max_length': 'int', '*bps_rd_max_length': 'int',
-            '*bps_wr_max_length': 'int', '*iops_max_length': 'int',
-            '*iops_rd_max_length': 'int', '*iops_wr_max_length': 'int',
-            '*iops_size': 'int', '*group': 'str' } }
-
-##
-# @block-stream:
-#
-# Copy data from a backing file into a block device.
-#
-# The block streaming operation is performed in the background until the entire
-# backing file has been copied.  This command returns immediately once streaming
-# has started.  The status of ongoing block streaming operations can be checked
-# with query-block-jobs.  The operation can be stopped before it has completed
-# using the block-job-cancel command.
-#
-# If a base file is specified then sectors are not copied from that base file and
-# its backing chain.  When streaming completes the image file will have the base
-# file as its backing file.  This can be used to stream a subset of the backing
-# file chain instead of flattening the entire image.
-#
-# On successful completion the image file is updated to drop the backing file
-# and the BLOCK_JOB_COMPLETED event is emitted.
-#
-# @device: the device name
-#
-# @base:   #optional the common backing file name
-#
-# @backing-file: #optional The backing file string to write into the active
-#                          layer. This filename is not validated.
-#
-#                          If a pathname string is such that it cannot be
-#                          resolved by QEMU, that means that subsequent QMP or
-#                          HMP commands must use node-names for the image in
-#                          question, as filename lookup methods will fail.
-#
-#                          If not specified, QEMU will automatically determine
-#                          the backing file string to use, or error out if there
-#                          is no obvious choice.  Care should be taken when
-#                          specifying the string, to specify a valid filename or
-#                          protocol.
-#                          (Since 2.1)
-#
-# @speed:  #optional the maximum speed, in bytes per second
-#
-# @on-error: #optional the action to take on an error (default report).
-#            'stop' and 'enospc' can only be used if the block device
-#            supports io-status (see BlockInfo).  Since 1.3.
-#
-# Returns: Nothing on success
-#          If @device does not exist, DeviceNotFound
-#
-# Since: 1.1
-##
-{ 'command': 'block-stream',
-  'data': { 'device': 'str', '*base': 'str', '*backing-file': 'str',
-            '*speed': 'int', '*on-error': 'BlockdevOnError' } }
-
-##
-# @block-job-set-speed:
-#
-# Set maximum speed for a background block operation.
-#
-# This command can only be issued when there is an active block job.
-#
-# Throttling can be disabled by setting the speed to 0.
-#
-# @device: the device name
-#
-# @speed:  the maximum speed, in bytes per second, or 0 for unlimited.
-#          Defaults to 0.
-#
-# Returns: Nothing on success
-#          If no background operation is active on this device, DeviceNotActive
-#
-# Since: 1.1
-##
-{ 'command': 'block-job-set-speed',
-  'data': { 'device': 'str', 'speed': 'int' } }
-
-##
-# @block-job-cancel:
-#
-# Stop an active background block operation.
-#
-# This command returns immediately after marking the active background block
-# operation for cancellation.  It is an error to call this command if no
-# operation is in progress.
-#
-# The operation will cancel as soon as possible and then emit the
-# BLOCK_JOB_CANCELLED event.  Before that happens the job is still visible when
-# enumerated using query-block-jobs.
-#
-# For streaming, the image file retains its backing file unless the streaming
-# operation happens to complete just as it is being cancelled.  A new streaming
-# operation can be started at a later time to finish copying all data from the
-# backing file.
-#
-# @device: the device name
-#
-# @force: #optional whether to allow cancellation of a paused job (default
-#         false).  Since 1.3.
-#
-# Returns: Nothing on success
-#          If no background operation is active on this device, DeviceNotActive
-#
-# Since: 1.1
-##
-{ 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' } }
-
-##
-# @block-job-pause:
-#
-# Pause an active background block operation.
-#
-# This command returns immediately after marking the active background block
-# operation for pausing.  It is an error to call this command if no
-# operation is in progress.  Pausing an already paused job has no cumulative
-# effect; a single block-job-resume command will resume the job.
-#
-# The operation will pause as soon as possible.  No event is emitted when
-# the operation is actually paused.  Cancelling a paused job automatically
-# resumes it.
-#
-# @device: the device name
-#
-# Returns: Nothing on success
-#          If no background operation is active on this device, DeviceNotActive
-#
-# Since: 1.3
-##
-{ 'command': 'block-job-pause', 'data': { 'device': 'str' } }
-
-##
-# @block-job-resume:
-#
-# Resume an active background block operation.
-#
-# This command returns immediately after resuming a paused background block
-# operation.  It is an error to call this command if no operation is in
-# progress.  Resuming an already running job is not an error.
-#
-# This command also clears the error status of the job.
-#
-# @device: the device name
-#
-# Returns: Nothing on success
-#          If no background operation is active on this device, DeviceNotActive
-#
-# Since: 1.3
-##
-{ 'command': 'block-job-resume', 'data': { 'device': 'str' } }
-
-##
-# @block-job-complete:
-#
-# Manually trigger completion of an active background block operation.  This
-# is supported for drive mirroring, where it also switches the device to
-# write to the target path only.  The ability to complete is signaled with
-# a BLOCK_JOB_READY event.
-#
-# This command completes an active background block operation synchronously.
-# The ordering of this command's return with the BLOCK_JOB_COMPLETED event
-# is not defined.  Note that if an I/O error occurs during the processing of
-# this command: 1) the command itself will fail; 2) the error will be processed
-# according to the rerror/werror arguments that were specified when starting
-# the operation.
-#
-# A cancelled or paused job cannot be completed.
-#
-# @device: the device name
-#
-# Returns: Nothing on success
-#          If no background operation is active on this device, DeviceNotActive
-#
-# Since: 1.3
-##
-{ 'command': 'block-job-complete', 'data': { 'device': 'str' } }
-
-##
-# @BlockdevDiscardOptions
-#
-# Determines how to handle discard requests.
-#
-# @ignore:      Ignore the request
-# @unmap:       Forward as an unmap request
-#
-# Since: 1.7
-##
-{ 'enum': 'BlockdevDiscardOptions',
-  'data': [ 'ignore', 'unmap' ] }
-
-##
-# @BlockdevDetectZeroesOptions
-#
-# Describes the operation mode for the automatic conversion of plain
-# zero writes by the OS to driver specific optimized zero write commands.
-#
-# @off:      Disabled (default)
-# @on:       Enabled
-# @unmap:    Enabled and even try to unmap blocks if possible. This requires
-#            also that @BlockdevDiscardOptions is set to unmap for this device.
-#
-# Since: 2.1
-##
-{ 'enum': 'BlockdevDetectZeroesOptions',
-  'data': [ 'off', 'on', 'unmap' ] }
-
-##
-# @BlockdevAioOptions
-#
-# Selects the AIO backend to handle I/O requests
-#
-# @threads:     Use qemu's thread pool
-# @native:      Use native AIO backend (only Linux and Windows)
-#
-# Since: 1.7
-##
-{ 'enum': 'BlockdevAioOptions',
-  'data': [ 'threads', 'native' ] }
-
-##
-# @BlockdevCacheOptions
-#
-# Includes cache-related options for block devices
-#
-# @direct:      #optional enables use of O_DIRECT (bypass the host page cache;
-#               default: false)
-# @no-flush:    #optional ignore any flush requests for the device (default:
-#               false)
-#
-# Since: 1.7
-##
-{ 'struct': 'BlockdevCacheOptions',
-  'data': { '*direct': 'bool',
-            '*no-flush': 'bool' } }
-
-##
-# @BlockdevDriver
-#
-# Drivers that are supported in block device operations.
-#
-# @host_device, @host_cdrom: Since 2.1
-#
-# Since: 2.0
-##
-{ 'enum': 'BlockdevDriver',
-  'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop',
-            'dmg', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device',
-            'http', 'https', 'luks', 'null-aio', 'null-co', 'parallels',
-            'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'tftp', 'vdi', 'vhdx',
-            'vmdk', 'vpc', 'vvfat' ] }
-
-##
-# @BlockdevOptionsFile
-#
-# Driver specific block device options for the file backend and similar
-# protocols.
-#
-# @filename:    path to the image file
-#
-# Since: 1.7
-##
-{ 'struct': 'BlockdevOptionsFile',
-  'data': { 'filename': 'str' } }
-
-##
-# @BlockdevOptionsNull
-#
-# Driver specific block device options for the null backend.
-#
-# @size:    #optional size of the device in bytes.
-# @latency-ns: #optional emulated latency (in nanoseconds) in processing
-#              requests. Default to zero which completes requests immediately.
-#              (Since 2.4)
-#
-# Since: 2.2
-##
-{ 'struct': 'BlockdevOptionsNull',
-  'data': { '*size': 'int', '*latency-ns': 'uint64' } }
-
-##
-# @BlockdevOptionsVVFAT
-#
-# Driver specific block device options for the vvfat protocol.
-#
-# @dir:         directory to be exported as FAT image
-# @fat-type:    #optional FAT type: 12, 16 or 32
-# @floppy:      #optional whether to export a floppy image (true) or
-#               partitioned hard disk (false; default)
-# @label:       #optional set the volume label, limited to 11 bytes. FAT16 and
-#               FAT32 traditionally have some restrictions on labels, which are
-#               ignored by most operating systems. Defaults to "QEMU VVFAT".
-#               (since 2.4)
-# @rw:          #optional whether to allow write operations (default: false)
-#
-# Since: 1.7
-##
-{ 'struct': 'BlockdevOptionsVVFAT',
-  'data': { 'dir': 'str', '*fat-type': 'int', '*floppy': 'bool',
-            '*label': 'str', '*rw': 'bool' } }
-
-##
-# @BlockdevOptionsGenericFormat
-#
-# Driver specific block device options for image format that have no option
-# besides their data source.
-#
-# @file:        reference to or definition of the data source block device
-#
-# Since: 1.7
-##
-{ 'struct': 'BlockdevOptionsGenericFormat',
-  'data': { 'file': 'BlockdevRef' } }
-
-##
-# @BlockdevOptionsLUKS
-#
-# Driver specific block device options for LUKS.
-#
-# @key-secret: #optional the ID of a QCryptoSecret object providing
-#              the decryption key (since 2.6). Mandatory except when
-#              doing a metadata-only probe of the image.
-#
-# Since: 2.6
-##
-{ 'struct': 'BlockdevOptionsLUKS',
-  'base': 'BlockdevOptionsGenericFormat',
-  'data': { '*key-secret': 'str' } }
-
-
-##
-# @BlockdevOptionsGenericCOWFormat
-#
-# Driver specific block device options for image format that have no option
-# besides their data source and an optional backing file.
-#
-# @backing:     #optional reference to or definition of the backing file block
-#               device (if missing, taken from the image file content). It is
-#               allowed to pass an empty string here in order to disable the
-#               default backing file.
-#
-# Since: 1.7
-##
-{ 'struct': 'BlockdevOptionsGenericCOWFormat',
-  'base': 'BlockdevOptionsGenericFormat',
-  'data': { '*backing': 'BlockdevRef' } }
-
-##
-# @Qcow2OverlapCheckMode
-#
-# General overlap check modes.
-#
-# @none:        Do not perform any checks
-#
-# @constant:    Perform only checks which can be done in constant time and
-#               without reading anything from disk
-#
-# @cached:      Perform only checks which can be done without reading anything
-#               from disk
-#
-# @all:         Perform all available overlap checks
-#
-# Since: 2.2
-##
-{ 'enum': 'Qcow2OverlapCheckMode',
-  'data': [ 'none', 'constant', 'cached', 'all' ] }
-
-##
-# @Qcow2OverlapCheckFlags
-#
-# Structure of flags for each metadata structure. Setting a field to 'true'
-# makes qemu guard that structure against unintended overwriting. The default
-# value is chosen according to the template given.
-#
-# @template: Specifies a template mode which can be adjusted using the other
-#            flags, defaults to 'cached'
-#
-# Since: 2.2
-##
-{ 'struct': 'Qcow2OverlapCheckFlags',
-  'data': { '*template':       'Qcow2OverlapCheckMode',
-            '*main-header':    'bool',
-            '*active-l1':      'bool',
-            '*active-l2':      'bool',
-            '*refcount-table': 'bool',
-            '*refcount-block': 'bool',
-            '*snapshot-table': 'bool',
-            '*inactive-l1':    'bool',
-            '*inactive-l2':    'bool' } }
-
-##
-# @Qcow2OverlapChecks
-#
-# Specifies which metadata structures should be guarded against unintended
-# overwriting.
-#
-# @flags:   set of flags for separate specification of each metadata structure
-#           type
-#
-# @mode:    named mode which chooses a specific set of flags
-#
-# Since: 2.2
-##
-{ 'alternate': 'Qcow2OverlapChecks',
-  'data': { 'flags': 'Qcow2OverlapCheckFlags',
-            'mode':  'Qcow2OverlapCheckMode' } }
-
-##
-# @BlockdevOptionsQcow2
-#
-# Driver specific block device options for qcow2.
-#
-# @lazy-refcounts:        #optional whether to enable the lazy refcounts
-#                         feature (default is taken from the image file)
-#
-# @pass-discard-request:  #optional whether discard requests to the qcow2
-#                         device should be forwarded to the data source
-#
-# @pass-discard-snapshot: #optional whether discard requests for the data source
-#                         should be issued when a snapshot operation (e.g.
-#                         deleting a snapshot) frees clusters in the qcow2 file
-#
-# @pass-discard-other:    #optional whether discard requests for the data source
-#                         should be issued on other occasions where a cluster
-#                         gets freed
-#
-# @overlap-check:         #optional which overlap checks to perform for writes
-#                         to the image, defaults to 'cached' (since 2.2)
-#
-# @cache-size:            #optional the maximum total size of the L2 table and
-#                         refcount block caches in bytes (since 2.2)
-#
-# @l2-cache-size:         #optional the maximum size of the L2 table cache in
-#                         bytes (since 2.2)
-#
-# @refcount-cache-size:   #optional the maximum size of the refcount block cache
-#                         in bytes (since 2.2)
-#
-# @cache-clean-interval:  #optional clean unused entries in the L2 and refcount
-#                         caches. The interval is in seconds. The default value
-#                         is 0 and it disables this feature (since 2.5)
-#
-# Since: 1.7
-##
-{ 'struct': 'BlockdevOptionsQcow2',
-  'base': 'BlockdevOptionsGenericCOWFormat',
-  'data': { '*lazy-refcounts': 'bool',
-            '*pass-discard-request': 'bool',
-            '*pass-discard-snapshot': 'bool',
-            '*pass-discard-other': 'bool',
-            '*overlap-check': 'Qcow2OverlapChecks',
-            '*cache-size': 'int',
-            '*l2-cache-size': 'int',
-            '*refcount-cache-size': 'int',
-            '*cache-clean-interval': 'int' } }
-
-
-##
-# @BlockdevOptionsArchipelago
-#
-# Driver specific block device options for Archipelago.
-#
-# @volume:              Name of the Archipelago volume image
-#
-# @mport:               #optional The port number on which mapperd is
-#                       listening. This is optional
-#                       and if not specified, QEMU will make Archipelago
-#                       use the default port (1001).
-#
-# @vport:               #optional The port number on which vlmcd is
-#                       listening. This is optional
-#                       and if not specified, QEMU will make Archipelago
-#                       use the default port (501).
-#
-# @segment:             #optional The name of the shared memory segment
-#                       Archipelago stack is using. This is optional
-#                       and if not specified, QEMU will make Archipelago
-#                       use the default value, 'archipelago'.
-# Since: 2.2
-##
-{ 'struct': 'BlockdevOptionsArchipelago',
-  'data': { 'volume': 'str',
-            '*mport': 'int',
-            '*vport': 'int',
-            '*segment': 'str' } }
-
-
-##
-# @BlkdebugEvent
-#
-# Trigger events supported by blkdebug.
-#
-# Since: 2.0
-##
-{ 'enum': 'BlkdebugEvent', 'prefix': 'BLKDBG',
-  'data': [ 'l1_update', 'l1_grow_alloc_table', 'l1_grow_write_table',
-            'l1_grow_activate_table', 'l2_load', 'l2_update',
-            'l2_update_compressed', 'l2_alloc_cow_read', 'l2_alloc_write',
-            'read_aio', 'read_backing_aio', 'read_compressed', 'write_aio',
-            'write_compressed', 'vmstate_load', 'vmstate_save', 'cow_read',
-            'cow_write', 'reftable_load', 'reftable_grow', 'reftable_update',
-            'refblock_load', 'refblock_update', 'refblock_update_part',
-            'refblock_alloc', 'refblock_alloc_hookup', 'refblock_alloc_write',
-            'refblock_alloc_write_blocks', 'refblock_alloc_write_table',
-            'refblock_alloc_switch_table', 'cluster_alloc',
-            'cluster_alloc_bytes', 'cluster_free', 'flush_to_os',
-            'flush_to_disk', 'pwritev_rmw_head', 'pwritev_rmw_after_head',
-            'pwritev_rmw_tail', 'pwritev_rmw_after_tail', 'pwritev',
-            'pwritev_zero', 'pwritev_done', 'empty_image_prepare' ] }
-
-##
-# @BlkdebugInjectErrorOptions
-#
-# Describes a single error injection for blkdebug.
-#
-# @event:       trigger event
-#
-# @state:       #optional the state identifier blkdebug needs to be in to
-#               actually trigger the event; defaults to "any"
-#
-# @errno:       #optional error identifier (errno) to be returned; defaults to
-#               EIO
-#
-# @sector:      #optional specifies the sector index which has to be affected
-#               in order to actually trigger the event; defaults to "any
-#               sector"
-#
-# @once:        #optional disables further events after this one has been
-#               triggered; defaults to false
-#
-# @immediately: #optional fail immediately; defaults to false
-#
-# Since: 2.0
-##
-{ 'struct': 'BlkdebugInjectErrorOptions',
-  'data': { 'event': 'BlkdebugEvent',
-            '*state': 'int',
-            '*errno': 'int',
-            '*sector': 'int',
-            '*once': 'bool',
-            '*immediately': 'bool' } }
-
-##
-# @BlkdebugSetStateOptions
-#
-# Describes a single state-change event for blkdebug.
-#
-# @event:       trigger event
-#
-# @state:       #optional the current state identifier blkdebug needs to be in;
-#               defaults to "any"
-#
-# @new_state:   the state identifier blkdebug is supposed to assume if
-#               this event is triggered
-#
-# Since: 2.0
-##
-{ 'struct': 'BlkdebugSetStateOptions',
-  'data': { 'event': 'BlkdebugEvent',
-            '*state': 'int',
-            'new_state': 'int' } }
-
-##
-# @BlockdevOptionsBlkdebug
-#
-# Driver specific block device options for blkdebug.
-#
-# @image:           underlying raw block device (or image file)
-#
-# @config:          #optional filename of the configuration file
-#
-# @align:           #optional required alignment for requests in bytes
-#
-# @inject-error:    #optional array of error injection descriptions
-#
-# @set-state:       #optional array of state-change descriptions
-#
-# Since: 2.0
-##
-{ 'struct': 'BlockdevOptionsBlkdebug',
-  'data': { 'image': 'BlockdevRef',
-            '*config': 'str',
-            '*align': 'int',
-            '*inject-error': ['BlkdebugInjectErrorOptions'],
-            '*set-state': ['BlkdebugSetStateOptions'] } }
-
-##
-# @BlockdevOptionsBlkverify
-#
-# Driver specific block device options for blkverify.
-#
-# @test:    block device to be tested
-#
-# @raw:     raw image used for verification
-#
-# Since: 2.0
-##
-{ 'struct': 'BlockdevOptionsBlkverify',
-  'data': { 'test': 'BlockdevRef',
-            'raw': 'BlockdevRef' } }
-
-##
-# @QuorumReadPattern
-#
-# An enumeration of quorum read patterns.
-#
-# @quorum: read all the children and do a quorum vote on reads
-#
-# @fifo: read only from the first child that has not failed
-#
-# Since: 2.2
-##
-{ 'enum': 'QuorumReadPattern', 'data': [ 'quorum', 'fifo' ] }
-
-##
-# @BlockdevOptionsQuorum
-#
-# Driver specific block device options for Quorum
-#
-# @blkverify:      #optional true if the driver must print content mismatch
-#                  set to false by default
-#
-# @children:       the children block devices to use
-#
-# @vote-threshold: the vote limit under which a read will fail
-#
-# @rewrite-corrupted: #optional rewrite corrupted data when quorum is reached
-#                     (Since 2.1)
-#
-# @read-pattern: #optional choose read pattern and set to quorum by default
-#                (Since 2.2)
-#
-# Since: 2.0
-##
-{ 'struct': 'BlockdevOptionsQuorum',
-  'data': { '*blkverify': 'bool',
-            'children': [ 'BlockdevRef' ],
-            'vote-threshold': 'int',
-            '*rewrite-corrupted': 'bool',
-            '*read-pattern': 'QuorumReadPattern' } }
-
-##
-# @BlockdevOptions
-#
-# Options for creating a block device.  Many options are available for all
-# block devices, independent of the block driver:
-#
-# @driver:        block driver name
-# @id:            #optional id by which the new block device can be referred to.
-#                 This option is only allowed on the top level of blockdev-add.
-#                 A BlockBackend will be created by blockdev-add if and only if
-#                 this option is given.
-# @node-name:     #optional the name of a block driver state node (Since 2.0).
-#                 This option is required on the top level of blockdev-add if
-#                 the @id option is not given there.
-# @discard:       #optional discard-related options (default: ignore)
-# @cache:         #optional cache-related options
-# @aio:           #optional AIO backend (default: threads)
-# @rerror:        #optional how to handle read errors on the device
-#                 (default: report)
-# @werror:        #optional how to handle write errors on the device
-#                 (default: enospc)
-# @read-only:     #optional whether the block device should be read-only
-#                 (default: false)
-# @stats-account-invalid: #optional whether to include invalid
-#                         operations when computing last access statistics
-#                         (default: true) (Since 2.5)
-# @stats-account-failed: #optional whether to include failed
-#                         operations when computing latency and last
-#                         access statistics (default: true) (Since 2.5)
-# @stats-intervals: #optional list of intervals for collecting I/O
-#                   statistics, in seconds (default: none) (Since 2.5)
-# @detect-zeroes: #optional detect and optimize zero writes (Since 2.1)
-#                 (default: off)
-#
-# Remaining options are determined by the block driver.
-#
-# Since: 1.7
-##
-{ 'union': 'BlockdevOptions',
-  'base': { 'driver': 'BlockdevDriver',
-            '*id': 'str',
-            '*node-name': 'str',
-            '*discard': 'BlockdevDiscardOptions',
-            '*cache': 'BlockdevCacheOptions',
-            '*aio': 'BlockdevAioOptions',
-            '*rerror': 'BlockdevOnError',
-            '*werror': 'BlockdevOnError',
-            '*read-only': 'bool',
-            '*stats-account-invalid': 'bool',
-            '*stats-account-failed': 'bool',
-            '*stats-intervals': ['int'],
-            '*detect-zeroes': 'BlockdevDetectZeroesOptions' },
-  'discriminator': 'driver',
-  'data': {
-      'archipelago':'BlockdevOptionsArchipelago',
-      'blkdebug':   'BlockdevOptionsBlkdebug',
-      'blkverify':  'BlockdevOptionsBlkverify',
-      'bochs':      'BlockdevOptionsGenericFormat',
-      'cloop':      'BlockdevOptionsGenericFormat',
-      'dmg':        'BlockdevOptionsGenericFormat',
-      'file':       'BlockdevOptionsFile',
-      'ftp':        'BlockdevOptionsFile',
-      'ftps':       'BlockdevOptionsFile',
-# TODO gluster: Wait for structured options
-      'host_cdrom': 'BlockdevOptionsFile',
-      'host_device':'BlockdevOptionsFile',
-      'http':       'BlockdevOptionsFile',
-      'https':      'BlockdevOptionsFile',
-# TODO iscsi: Wait for structured options
-      'luks':       'BlockdevOptionsLUKS',
-# TODO nbd: Should take InetSocketAddress for 'host'?
-# TODO nfs: Wait for structured options
-      'null-aio':   'BlockdevOptionsNull',
-      'null-co':    'BlockdevOptionsNull',
-      'parallels':  'BlockdevOptionsGenericFormat',
-      'qcow2':      'BlockdevOptionsQcow2',
-      'qcow':       'BlockdevOptionsGenericCOWFormat',
-      'qed':        'BlockdevOptionsGenericCOWFormat',
-      'quorum':     'BlockdevOptionsQuorum',
-      'raw':        'BlockdevOptionsGenericFormat',
-# TODO rbd: Wait for structured options
-# TODO sheepdog: Wait for structured options
-# TODO ssh: Should take InetSocketAddress for 'host'?
-      'tftp':       'BlockdevOptionsFile',
-      'vdi':        'BlockdevOptionsGenericFormat',
-      'vhdx':       'BlockdevOptionsGenericFormat',
-      'vmdk':       'BlockdevOptionsGenericCOWFormat',
-      'vpc':        'BlockdevOptionsGenericFormat',
-      'vvfat':      'BlockdevOptionsVVFAT'
-  } }
-
-##
-# @BlockdevRef
-#
-# Reference to a block device.
-#
-# @definition:      defines a new block device inline
-# @reference:       references the ID of an existing block device. An
-#                   empty string means that no block device should be
-#                   referenced.
-#
-# Since: 1.7
-##
-{ 'alternate': 'BlockdevRef',
-  'data': { 'definition': 'BlockdevOptions',
-            'reference': 'str' } }
-
-##
-# @blockdev-add:
-#
-# Creates a new block device. If the @id option is given at the top level, a
-# BlockBackend will be created; otherwise, @node-name is mandatory at the top
-# level and no BlockBackend will be created.
-#
-# This command is still a work in progress.  It doesn't support all
-# block drivers among other things.  Stay away from it unless you want
-# to help with its development.
-#
-# @options: block device options for the new device
-#
-# Since: 1.7
-##
-{ 'command': 'blockdev-add', 'data': { 'options': 'BlockdevOptions' } }
-
-##
-# @x-blockdev-del:
-#
-# Deletes a block device that has been added using blockdev-add.
-# The selected device can be either a block backend or a graph node.
-#
-# In the former case the backend will be destroyed, along with its
-# inserted medium if there's any. The command will fail if the backend
-# or its medium are in use.
-#
-# In the latter case the node will be destroyed. The command will fail
-# if the node is attached to a block backend or is otherwise being
-# used.
-#
-# One of @id or @node-name must be specified, but not both.
-#
-# This command is still a work in progress and is considered
-# experimental. Stay away from it unless you want to help with its
-# development.
-#
-# @id: #optional Name of the block backend device to delete.
-#
-# @node-name: #optional Name of the graph node to delete.
-#
-# Since: 2.5
-##
-{ 'command': 'x-blockdev-del', 'data': { '*id': 'str', '*node-name': 'str' } }
-
-##
-# @blockdev-open-tray:
-#
-# Opens a block device's tray. If there is a block driver state tree inserted as
-# a medium, it will become inaccessible to the guest (but it will remain
-# associated to the block device, so closing the tray will make it accessible
-# again).
-#
-# If the tray was already open before, this will be a no-op.
-#
-# Once the tray opens, a DEVICE_TRAY_MOVED event is emitted. There are cases in
-# which no such event will be generated, these include:
-# - if the guest has locked the tray, @force is false and the guest does not
-#   respond to the eject request
-# - if the BlockBackend denoted by @device does not have a guest device attached
-#   to it
-# - if the guest device does not have an actual tray
-#
-# @device: block device name
-#
-# @force:  #optional if false (the default), an eject request will be sent to
-#          the guest if it has locked the tray (and the tray will not be opened
-#          immediately); if true, the tray will be opened regardless of whether
-#          it is locked
-#
-# Since: 2.5
-##
-{ 'command': 'blockdev-open-tray',
-  'data': { 'device': 'str',
-            '*force': 'bool' } }
-
-##
-# @blockdev-close-tray:
-#
-# Closes a block device's tray. If there is a block driver state tree associated
-# with the block device (which is currently ejected), that tree will be loaded
-# as the medium.
-#
-# If the tray was already closed before, this will be a no-op.
-#
-# @device: block device name
-#
-# Since: 2.5
-##
-{ 'command': 'blockdev-close-tray',
-  'data': { 'device': 'str' } }
-
-##
-# @x-blockdev-remove-medium:
-#
-# Removes a medium (a block driver state tree) from a block device. That block
-# device's tray must currently be open (unless there is no attached guest
-# device).
-#
-# If the tray is open and there is no medium inserted, this will be a no-op.
-#
-# This command is still a work in progress and is considered experimental.
-# Stay away from it unless you want to help with its development.
-#
-# @device: block device name
-#
-# Since: 2.5
-##
-{ 'command': 'x-blockdev-remove-medium',
-  'data': { 'device': 'str' } }
-
-##
-# @x-blockdev-insert-medium:
-#
-# Inserts a medium (a block driver state tree) into a block device. That block
-# device's tray must currently be open (unless there is no attached guest
-# device) and there must be no medium inserted already.
-#
-# This command is still a work in progress and is considered experimental.
-# Stay away from it unless you want to help with its development.
-#
-# @device:    block device name
-#
-# @node-name: name of a node in the block driver state graph
-#
-# Since: 2.5
-##
-{ 'command': 'x-blockdev-insert-medium',
-  'data': { 'device': 'str',
-            'node-name': 'str'} }
-
-
-##
-# @BlockdevChangeReadOnlyMode:
-#
-# Specifies the new read-only mode of a block device subject to the
-# @blockdev-change-medium command.
-#
-# @retain:      Retains the current read-only mode
-#
-# @read-only:   Makes the device read-only
-#
-# @read-write:  Makes the device writable
-#
-# Since: 2.3
-##
-{ 'enum': 'BlockdevChangeReadOnlyMode',
-  'data': ['retain', 'read-only', 'read-write'] }
-
-
-##
-# @blockdev-change-medium:
-#
-# Changes the medium inserted into a block device by ejecting the current medium
-# and loading a new image file which is inserted as the new medium (this command
-# combines blockdev-open-tray, x-blockdev-remove-medium,
-# x-blockdev-insert-medium and blockdev-close-tray).
-#
-# @device:          block device name
-#
-# @filename:        filename of the new image to be loaded
-#
-# @format:          #optional, format to open the new image with (defaults to
-#                   the probed format)
-#
-# @read-only-mode:  #optional, change the read-only mode of the device; defaults
-#                   to 'retain'
-#
-# Since: 2.5
-##
-{ 'command': 'blockdev-change-medium',
-  'data': { 'device': 'str',
-            'filename': 'str',
-            '*format': 'str',
-            '*read-only-mode': 'BlockdevChangeReadOnlyMode' } }
-
-
-##
-# @BlockErrorAction
-#
-# An enumeration of action that has been taken when a DISK I/O occurs
-#
-# @ignore: error has been ignored
-#
-# @report: error has been reported to the device
-#
-# @stop: error caused VM to be stopped
-#
-# Since: 2.1
-##
-{ 'enum': 'BlockErrorAction',
-  'data': [ 'ignore', 'report', 'stop' ] }
-
-
-##
-# @BLOCK_IMAGE_CORRUPTED
-#
-# Emitted when a corruption has been detected in a disk image
-#
-# @device: device name. This is always present for compatibility
-#          reasons, but it can be empty ("") if the image does not
-#          have a device name associated.
-#
-# @node-name: #optional node name (Since: 2.4)
-#
-# @msg: informative message for human consumption, such as the kind of
-#       corruption being detected. It should not be parsed by machine as it is
-#       not guaranteed to be stable
-#
-# @offset: #optional, if the corruption resulted from an image access, this is
-#          the host's access offset into the image
-#
-# @size: #optional, if the corruption resulted from an image access, this is
-#        the access size
-#
-# fatal: if set, the image is marked corrupt and therefore unusable after this
-#        event and must be repaired (Since 2.2; before, every
-#        BLOCK_IMAGE_CORRUPTED event was fatal)
-#
-# Since: 1.7
-##
-{ 'event': 'BLOCK_IMAGE_CORRUPTED',
-  'data': { 'device'     : 'str',
-            '*node-name' : 'str',
-            'msg'        : 'str',
-            '*offset'    : 'int',
-            '*size'      : 'int',
-            'fatal'      : 'bool' } }
-
-##
-# @BLOCK_IO_ERROR
-#
-# Emitted when a disk I/O error occurs
-#
-# @device: device name
-#
-# @operation: I/O operation
-#
-# @action: action that has been taken
-#
-# @nospace: #optional true if I/O error was caused due to a no-space
-#           condition. This key is only present if query-block's
-#           io-status is present, please see query-block documentation
-#           for more information (since: 2.2)
-#
-# @reason: human readable string describing the error cause.
-#          (This field is a debugging aid for humans, it should not
-#           be parsed by applications) (since: 2.2)
-#
-# Note: If action is "stop", a STOP event will eventually follow the
-# BLOCK_IO_ERROR event
-#
-# Since: 0.13.0
-##
-{ 'event': 'BLOCK_IO_ERROR',
-  'data': { 'device': 'str', 'operation': 'IoOperationType',
-            'action': 'BlockErrorAction', '*nospace': 'bool',
-            'reason': 'str' } }
-
-##
-# @BLOCK_JOB_COMPLETED
-#
-# Emitted when a block job has completed
-#
-# @type: job type
-#
-# @device: device name
-#
-# @len: maximum progress value
-#
-# @offset: current progress value. On success this is equal to len.
-#          On failure this is less than len
-#
-# @speed: rate limit, bytes per second
-#
-# @error: #optional, error message. Only present on failure. This field
-#         contains a human-readable error message. There are no semantics
-#         other than that streaming has failed and clients should not try to
-#         interpret the error string
-#
-# Since: 1.1
-##
-{ 'event': 'BLOCK_JOB_COMPLETED',
-  'data': { 'type'  : 'BlockJobType',
-            'device': 'str',
-            'len'   : 'int',
-            'offset': 'int',
-            'speed' : 'int',
-            '*error': 'str' } }
-
-##
-# @BLOCK_JOB_CANCELLED
-#
-# Emitted when a block job has been cancelled
-#
-# @type: job type
-#
-# @device: device name
-#
-# @len: maximum progress value
-#
-# @offset: current progress value. On success this is equal to len.
-#          On failure this is less than len
-#
-# @speed: rate limit, bytes per second
-#
-# Since: 1.1
-##
-{ 'event': 'BLOCK_JOB_CANCELLED',
-  'data': { 'type'  : 'BlockJobType',
-            'device': 'str',
-            'len'   : 'int',
-            'offset': 'int',
-            'speed' : 'int' } }
-
-##
-# @BLOCK_JOB_ERROR
-#
-# Emitted when a block job encounters an error
-#
-# @device: device name
-#
-# @operation: I/O operation
-#
-# @action: action that has been taken
-#
-# Since: 1.3
-##
-{ 'event': 'BLOCK_JOB_ERROR',
-  'data': { 'device'   : 'str',
-            'operation': 'IoOperationType',
-            'action'   : 'BlockErrorAction' } }
-
-##
-# @BLOCK_JOB_READY
-#
-# Emitted when a block job is ready to complete
-#
-# @type: job type
-#
-# @device: device name
-#
-# @len: maximum progress value
-#
-# @offset: current progress value. On success this is equal to len.
-#          On failure this is less than len
-#
-# @speed: rate limit, bytes per second
-#
-# Note: The "ready to complete" status is always reset by a @BLOCK_JOB_ERROR
-# event
-#
-# Since: 1.3
-##
-{ 'event': 'BLOCK_JOB_READY',
-  'data': { 'type'  : 'BlockJobType',
-            'device': 'str',
-            'len'   : 'int',
-            'offset': 'int',
-            'speed' : 'int' } }
-
-# @PreallocMode
-#
-# Preallocation mode of QEMU image file
-#
-# @off: no preallocation
-# @metadata: preallocate only for metadata
-# @falloc: like @full preallocation but allocate disk space by
-#          posix_fallocate() rather than writing zeros.
-# @full: preallocate all data by writing zeros to device to ensure disk
-#        space is really available. @full preallocation also sets up
-#        metadata correctly.
-#
-# Since 2.2
-##
-{ 'enum': 'PreallocMode',
-  'data': [ 'off', 'metadata', 'falloc', 'full' ] }
-
-##
-# @BLOCK_WRITE_THRESHOLD
-#
-# Emitted when writes on block device reaches or exceeds the
-# configured write threshold. For thin-provisioned devices, this
-# means the device should be extended to avoid pausing for
-# disk exhaustion.
-# The event is one shot. Once triggered, it needs to be
-# re-registered with another block-set-threshold command.
-#
-# @node-name: graph node name on which the threshold was exceeded.
-#
-# @amount-exceeded: amount of data which exceeded the threshold, in bytes.
-#
-# @write-threshold: last configured threshold, in bytes.
-#
-# Since: 2.3
-##
-{ 'event': 'BLOCK_WRITE_THRESHOLD',
-  'data': { 'node-name': 'str',
-            'amount-exceeded': 'uint64',
-            'write-threshold': 'uint64' } }
-
-##
-# @block-set-write-threshold
-#
-# Change the write threshold for a block drive. An event will be delivered
-# if a write to this block drive crosses the configured threshold.
-# This is useful to transparently resize thin-provisioned drives without
-# the guest OS noticing.
-#
-# @node-name: graph node name on which the threshold must be set.
-#
-# @write-threshold: configured threshold for the block device, bytes.
-#                   Use 0 to disable the threshold.
-#
-# Since: 2.3
-##
-{ 'command': 'block-set-write-threshold',
-  'data': { 'node-name': 'str', 'write-threshold': 'uint64' } }
diff --git a/qemu/qapi/block.json b/qemu/qapi/block.json
deleted file mode 100644
index 937337dce..000000000
--- a/qemu/qapi/block.json
+++ /dev/null
@@ -1,214 +0,0 @@
-# -*- Mode: Python -*-
-#
-# QAPI block definitions (vm related)
-
-# QAPI block core definitions
-{ 'include': 'block-core.json' }
-
-##
-# @BiosAtaTranslation:
-#
-# Policy that BIOS should use to interpret cylinder/head/sector
-# addresses.  Note that Bochs BIOS and SeaBIOS will not actually
-# translate logical CHS to physical; instead, they will use logical
-# block addressing.
-#
-# @auto: If cylinder/heads/sizes are passed, choose between none and LBA
-#        depending on the size of the disk.  If they are not passed,
-#        choose none if QEMU can guess that the disk had 16 or fewer
-#        heads, large if QEMU can guess that the disk had 131072 or
-#        fewer tracks across all heads (i.e. cylinders*heads<131072),
-#        otherwise LBA.
-#
-# @none: The physical disk geometry is equal to the logical geometry.
-#
-# @lba: Assume 63 sectors per track and one of 16, 32, 64, 128 or 255
-#       heads (if fewer than 255 are enough to cover the whole disk
-#       with 1024 cylinders/head).  The number of cylinders/head is
-#       then computed based on the number of sectors and heads.
-#
-# @large: The number of cylinders per head is scaled down to 1024
-#         by correspondingly scaling up the number of heads.
-#
-# @rechs: Same as @large, but first convert a 16-head geometry to
-#         15-head, by proportionally scaling up the number of
-#         cylinders/head.
-#
-# Since: 2.0
-##
-{ 'enum': 'BiosAtaTranslation',
-  'data': ['auto', 'none', 'lba', 'large', 'rechs']}
-
-##
-# @FloppyDriveType
-#
-# Type of Floppy drive to be emulated by the Floppy Disk Controller.
-#
-# @144:  1.44MB 3.5" drive
-# @288:  2.88MB 3.5" drive
-# @120:  1.2MB 5.25" drive
-# @none: No drive connected
-# @auto: Automatically determined by inserted media at boot
-#
-# Since: 2.6
-##
-{ 'enum': 'FloppyDriveType',
-  'data': ['144', '288', '120', 'none', 'auto']}
-
-##
-# @BlockdevSnapshotInternal
-#
-# @device: the name of the device to generate the snapshot from
-#
-# @name: the name of the internal snapshot to be created
-#
-# Notes: In transaction, if @name is empty, or any snapshot matching @name
-#        exists, the operation will fail. Only some image formats support it,
-#        for example, qcow2, rbd, and sheepdog.
-#
-# Since: 1.7
-##
-{ 'struct': 'BlockdevSnapshotInternal',
-  'data': { 'device': 'str', 'name': 'str' } }
-
-##
-# @blockdev-snapshot-internal-sync
-#
-# Synchronously take an internal snapshot of a block device, when the format
-# of the image used supports it.
-#
-# For the arguments, see the documentation of BlockdevSnapshotInternal.
-#
-# Returns: nothing on success
-#          If @device is not a valid block device, DeviceNotFound
-#          If any snapshot matching @name exists, or @name is empty,
-#          GenericError
-#          If the format of the image used does not support it,
-#          BlockFormatFeatureNotSupported
-#
-# Since 1.7
-##
-{ 'command': 'blockdev-snapshot-internal-sync',
-  'data': 'BlockdevSnapshotInternal' }
-
-##
-# @blockdev-snapshot-delete-internal-sync
-#
-# Synchronously delete an internal snapshot of a block device, when the format
-# of the image used support it. The snapshot is identified by name or id or
-# both. One of the name or id is required. Return SnapshotInfo for the
-# successfully deleted snapshot.
-#
-# @device: the name of the device to delete the snapshot from
-#
-# @id: optional the snapshot's ID to be deleted
-#
-# @name: optional the snapshot's name to be deleted
-#
-# Returns: SnapshotInfo on success
-#          If @device is not a valid block device, DeviceNotFound
-#          If snapshot not found, GenericError
-#          If the format of the image used does not support it,
-#          BlockFormatFeatureNotSupported
-#          If @id and @name are both not specified, GenericError
-#
-# Since 1.7
-##
-{ 'command': 'blockdev-snapshot-delete-internal-sync',
-  'data': { 'device': 'str', '*id': 'str', '*name': 'str'},
-  'returns': 'SnapshotInfo' }
-
-##
-# @eject:
-#
-# Ejects a device from a removable drive.
-#
-# @device:  The name of the device
-#
-# @force:   @optional If true, eject regardless of whether the drive is locked.
-#           If not specified, the default value is false.
-#
-# Returns:  Nothing on success
-#           If @device is not a valid block device, DeviceNotFound
-#
-# Notes:    Ejecting a device will no media results in success
-#
-# Since: 0.14.0
-##
-{ 'command': 'eject', 'data': {'device': 'str', '*force': 'bool'} }
-
-##
-# @nbd-server-start:
-#
-# Start an NBD server listening on the given host and port.  Block
-# devices can then be exported using @nbd-server-add.  The NBD
-# server will present them as named exports; for example, another
-# QEMU instance could refer to them as "nbd:HOST:PORT:exportname=NAME".
-#
-# @addr: Address on which to listen.
-# @tls-creds: (optional) ID of the TLS credentials object. Since 2.6
-#
-# Returns: error if the server is already running.
-#
-# Since: 1.3.0
-##
-{ 'command': 'nbd-server-start',
-  'data': { 'addr': 'SocketAddress',
-            '*tls-creds': 'str'} }
-
-##
-# @nbd-server-add:
-#
-# Export a device to QEMU's embedded NBD server.
-#
-# @device: Block device to be exported
-#
-# @writable: Whether clients should be able to write to the device via the
-#     NBD connection (default false). #optional
-#
-# Returns: error if the device is already marked for export.
-#
-# Since: 1.3.0
-##
-{ 'command': 'nbd-server-add', 'data': {'device': 'str', '*writable': 'bool'} }
-
-##
-# @nbd-server-stop:
-#
-# Stop QEMU's embedded NBD server, and unregister all devices previously
-# added via @nbd-server-add.
-#
-# Since: 1.3.0
-##
-{ 'command': 'nbd-server-stop' }
-
-##
-# @DEVICE_TRAY_MOVED
-#
-# Emitted whenever the tray of a removable device is moved by the guest or by
-# HMP/QMP commands
-#
-# @device: device name
-#
-# @tray-open: true if the tray has been opened or false if it has been closed
-#
-# Since: 1.1
-##
-{ 'event': 'DEVICE_TRAY_MOVED',
-  'data': { 'device': 'str', 'tray-open': 'bool' } }
-
-##
-# @QuorumOpType
-#
-# An enumeration of the quorum operation types
-#
-# @read: read operation
-#
-# @write: write operation
-#
-# @flush: flush operation
-#
-# Since: 2.6
-##
-{ 'enum': 'QuorumOpType',
-  'data': [ 'read', 'write', 'flush' ] }
diff --git a/qemu/qapi/common.json b/qemu/qapi/common.json
deleted file mode 100644
index 9353a7b37..000000000
--- a/qemu/qapi/common.json
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- Mode: Python -*-
-#
-# QAPI common definitions
-
-##
-# @QapiErrorClass
-#
-# QEMU error classes
-#
-# @GenericError: this is used for errors that don't require a specific error
-#                class. This should be the default case for most errors
-#
-# @CommandNotFound: the requested command has not been found
-#
-# @DeviceEncrypted: the requested operation can't be fulfilled because the
-#                   selected device is encrypted
-#
-# @DeviceNotActive: a device has failed to be become active
-#
-# @DeviceNotFound: the requested device has not been found
-#
-# @KVMMissingCap: the requested operation can't be fulfilled because a
-#                 required KVM capability is missing
-#
-# Since: 1.2
-##
-{ 'enum': 'QapiErrorClass',
-  # Keep this in sync with ErrorClass in error.h
-  'data': [ 'GenericError', 'CommandNotFound', 'DeviceEncrypted',
-            'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] }
-
-##
-# @VersionTriple
-#
-# A three-part version number.
-#
-# @qemu.major:  The major version number.
-#
-# @qemu.minor:  The minor version number.
-#
-# @qemu.micro:  The micro version number.
-#
-# Since: 2.4
-##
-{ 'struct': 'VersionTriple',
-  'data': {'major': 'int', 'minor': 'int', 'micro': 'int'} }
-
-
-##
-# @VersionInfo:
-#
-# A description of QEMU's version.
-#
-# @qemu:        The version of QEMU.  By current convention, a micro
-#               version of 50 signifies a development branch.  A micro version
-#               greater than or equal to 90 signifies a release candidate for
-#               the next minor version.  A micro version of less than 50
-#               signifies a stable release.
-#
-# @package:     QEMU will always set this field to an empty string.  Downstream
-#               versions of QEMU should set this to a non-empty string.  The
-#               exact format depends on the downstream however it highly
-#               recommended that a unique name is used.
-#
-# Since: 0.14.0
-##
-{ 'struct': 'VersionInfo',
-  'data': {'qemu': 'VersionTriple', 'package': 'str'} }
-
-##
-# @query-version:
-#
-# Returns the current version of QEMU.
-#
-# Returns:  A @VersionInfo object describing the current version of QEMU.
-#
-# Since: 0.14.0
-##
-{ 'command': 'query-version', 'returns': 'VersionInfo' }
-
-##
-# @CommandInfo:
-#
-# Information about a QMP command
-#
-# @name: The command name
-#
-# Since: 0.14.0
-##
-{ 'struct': 'CommandInfo', 'data': {'name': 'str'} }
-
-##
-# @query-commands:
-#
-# Return a list of supported QMP commands by this server
-#
-# Returns: A list of @CommandInfo for all supported commands
-#
-# Since: 0.14.0
-##
-{ 'command': 'query-commands', 'returns': ['CommandInfo'] }
-
-##
-# @OnOffAuto
-#
-# An enumeration of three options: on, off, and auto
-#
-# @auto: QEMU selects the value between on and off
-#
-# @on: Enabled
-#
-# @off: Disabled
-#
-# Since: 2.2
-##
-{ 'enum': 'OnOffAuto',
-  'data': [ 'auto', 'on', 'off' ] }
-
-##
-# @OnOffSplit
-#
-# An enumeration of three values: on, off, and split
-#
-# @on: Enabled
-#
-# @off: Disabled
-#
-# @split: Mixed
-#
-# Since: 2.6
-##
-{ 'enum': 'OnOffSplit',
-  'data': [ 'on', 'off', 'split' ] }
diff --git a/qemu/qapi/crypto.json b/qemu/qapi/crypto.json
deleted file mode 100644
index 760d0c057..000000000
--- a/qemu/qapi/crypto.json
+++ /dev/null
@@ -1,222 +0,0 @@
-# -*- Mode: Python -*-
-#
-# QAPI crypto definitions
-
-##
-# QCryptoTLSCredsEndpoint:
-#
-# The type of network endpoint that will be using the credentials.
-# Most types of credential require different setup / structures
-# depending on whether they will be used in a server versus a
-# client.
-#
-# @client: the network endpoint is acting as the client
-#
-# @server: the network endpoint is acting as the server
-#
-# Since: 2.5
-##
-{ 'enum': 'QCryptoTLSCredsEndpoint',
-  'prefix': 'QCRYPTO_TLS_CREDS_ENDPOINT',
-  'data': ['client', 'server']}
-
-
-##
-# QCryptoSecretFormat:
-#
-# The data format that the secret is provided in
-#
-# @raw: raw bytes. When encoded in JSON only valid UTF-8 sequences can be used
-# @base64: arbitrary base64 encoded binary data
-# Since: 2.6
-##
-{ 'enum': 'QCryptoSecretFormat',
-  'prefix': 'QCRYPTO_SECRET_FORMAT',
-  'data': ['raw', 'base64']}
-
-
-##
-# QCryptoHashAlgorithm:
-#
-# The supported algorithms for computing content digests
-#
-# @md5: MD5. Should not be used in any new code, legacy compat only
-# @sha1: SHA-1. Should not be used in any new code, legacy compat only
-# @sha256: SHA-256. Current recommended strong hash.
-# Since: 2.6
-##
-{ 'enum': 'QCryptoHashAlgorithm',
-  'prefix': 'QCRYPTO_HASH_ALG',
-  'data': ['md5', 'sha1', 'sha256']}
-
-
-##
-# QCryptoCipherAlgorithm:
-#
-# The supported algorithms for content encryption ciphers
-#
-# @aes-128: AES with 128 bit / 16 byte keys
-# @aes-192: AES with 192 bit / 24 byte keys
-# @aes-256: AES with 256 bit / 32 byte keys
-# @des-rfb: RFB specific variant of single DES. Do not use except in VNC.
-# @cast5-128: Cast5 with 128 bit / 16 byte keys
-# @serpent-128: Serpent with 128 bit / 16 byte keys
-# @serpent-192: Serpent with 192 bit / 24 byte keys
-# @serpent-256: Serpent with 256 bit / 32 byte keys
-# @twofish-128: Twofish with 128 bit / 16 byte keys
-# @twofish-192: Twofish with 192 bit / 24 byte keys
-# @twofish-256: Twofish with 256 bit / 32 byte keys
-# Since: 2.6
-##
-{ 'enum': 'QCryptoCipherAlgorithm',
-  'prefix': 'QCRYPTO_CIPHER_ALG',
-  'data': ['aes-128', 'aes-192', 'aes-256',
-           'des-rfb',
-           'cast5-128',
-           'serpent-128', 'serpent-192', 'serpent-256',
-           'twofish-128', 'twofish-192', 'twofish-256']}
-
-
-##
-# QCryptoCipherMode:
-#
-# The supported modes for content encryption ciphers
-#
-# @ecb: Electronic Code Book
-# @cbc: Cipher Block Chaining
-# @xts: XEX with tweaked code book and ciphertext stealing
-# Since: 2.6
-##
-{ 'enum': 'QCryptoCipherMode',
-  'prefix': 'QCRYPTO_CIPHER_MODE',
-  'data': ['ecb', 'cbc', 'xts']}
-
-
-##
-# QCryptoIVGenAlgorithm:
-#
-# The supported algorithms for generating initialization
-# vectors for full disk encryption. The 'plain' generator
-# should not be used for disks with sector numbers larger
-# than 2^32, except where compatibility with pre-existing
-# Linux dm-crypt volumes is required.
-#
-# @plain: 64-bit sector number truncated to 32-bits
-# @plain64: 64-bit sector number
-# @essiv: 64-bit sector number encrypted with a hash of the encryption key
-# Since: 2.6
-##
-{ 'enum': 'QCryptoIVGenAlgorithm',
-  'prefix': 'QCRYPTO_IVGEN_ALG',
-  'data': ['plain', 'plain64', 'essiv']}
-
-##
-# QCryptoBlockFormat:
-#
-# The supported full disk encryption formats
-#
-# @qcow: QCow/QCow2 built-in AES-CBC encryption. Use only
-#        for liberating data from old images.
-# @luks: LUKS encryption format. Recommended for new images
-#
-# Since: 2.6
-##
-{ 'enum': 'QCryptoBlockFormat',
-#  'prefix': 'QCRYPTO_BLOCK_FORMAT',
-  'data': ['qcow', 'luks']}
-
-##
-# QCryptoBlockOptionsBase:
-#
-# The common options that apply to all full disk
-# encryption formats
-#
-# @format: the encryption format
-#
-# Since: 2.6
-##
-{ 'struct': 'QCryptoBlockOptionsBase',
-  'data': { 'format': 'QCryptoBlockFormat' }}
-
-##
-# QCryptoBlockOptionsQCow:
-#
-# The options that apply to QCow/QCow2 AES-CBC encryption format
-#
-# @key-secret: #optional the ID of a QCryptoSecret object providing the
-#              decryption key. Mandatory except when probing image for
-#              metadata only.
-#
-# Since: 2.6
-##
-{ 'struct': 'QCryptoBlockOptionsQCow',
-  'data': { '*key-secret': 'str' }}
-
-##
-# QCryptoBlockOptionsLUKS:
-#
-# The options that apply to LUKS encryption format
-#
-# @key-secret: #optional the ID of a QCryptoSecret object providing the
-#              decryption key. Mandatory except when probing image for
-#              metadata only.
-# Since: 2.6
-##
-{ 'struct': 'QCryptoBlockOptionsLUKS',
-  'data': { '*key-secret': 'str' }}
-
-
-##
-# QCryptoBlockCreateOptionsLUKS:
-#
-# The options that apply to LUKS encryption format initialization
-#
-# @cipher-alg: #optional the cipher algorithm for data encryption
-#              Currently defaults to 'aes'.
-# @cipher-mode: #optional the cipher mode for data encryption
-#               Currently defaults to 'cbc'
-# @ivgen-alg: #optional the initialization vector generator
-#             Currently defaults to 'essiv'
-# @ivgen-hash-alg: #optional the initialization vector generator hash
-#                  Currently defaults to 'sha256'
-# @hash-alg: #optional the master key hash algorithm
-#            Currently defaults to 'sha256'
-# Since: 2.6
-##
-{ 'struct': 'QCryptoBlockCreateOptionsLUKS',
-  'base': 'QCryptoBlockOptionsLUKS',
-  'data': { '*cipher-alg': 'QCryptoCipherAlgorithm',
-            '*cipher-mode': 'QCryptoCipherMode',
-            '*ivgen-alg': 'QCryptoIVGenAlgorithm',
-            '*ivgen-hash-alg': 'QCryptoHashAlgorithm',
-            '*hash-alg': 'QCryptoHashAlgorithm'}}
-
-
-##
-# QCryptoBlockOpenOptions:
-#
-# The options that are available for all encryption formats
-# when opening an existing volume
-#
-# Since: 2.6
-##
-{ 'union': 'QCryptoBlockOpenOptions',
-  'base': 'QCryptoBlockOptionsBase',
-  'discriminator': 'format',
-  'data': { 'qcow': 'QCryptoBlockOptionsQCow',
-            'luks': 'QCryptoBlockOptionsLUKS' } }
-
-
-##
-# QCryptoBlockCreateOptions:
-#
-# The options that are available for all encryption formats
-# when initializing a new volume
-#
-# Since: 2.6
-##
-{ 'union': 'QCryptoBlockCreateOptions',
-  'base': 'QCryptoBlockOptionsBase',
-  'discriminator': 'format',
-  'data': { 'qcow': 'QCryptoBlockOptionsQCow',
-            'luks': 'QCryptoBlockCreateOptionsLUKS' } }
diff --git a/qemu/qapi/event.json b/qemu/qapi/event.json
deleted file mode 100644
index 8642052eb..000000000
--- a/qemu/qapi/event.json
+++ /dev/null
@@ -1,389 +0,0 @@
-##
-# @SHUTDOWN
-#
-# Emitted when the virtual machine has shut down, indicating that qemu is
-# about to exit.
-#
-# Note: If the command-line option "-no-shutdown" has been specified, qemu will
-# not exit, and a STOP event will eventually follow the SHUTDOWN event
-#
-# Since: 0.12.0
-##
-{ 'event': 'SHUTDOWN' }
-
-##
-# @POWERDOWN
-#
-# Emitted when the virtual machine is powered down through the power control
-# system, such as via ACPI.
-#
-# Since: 0.12.0
-##
-{ 'event': 'POWERDOWN' }
-
-##
-# @RESET
-#
-# Emitted when the virtual machine is reset
-#
-# Since: 0.12.0
-##
-{ 'event': 'RESET' }
-
-##
-# @STOP
-#
-# Emitted when the virtual machine is stopped
-#
-# Since: 0.12.0
-##
-{ 'event': 'STOP' }
-
-##
-# @RESUME
-#
-# Emitted when the virtual machine resumes execution
-#
-# Since: 0.12.0
-##
-{ 'event': 'RESUME' }
-
-##
-# @SUSPEND
-#
-# Emitted when guest enters a hardware suspension state, for example, S3 state,
-# which is sometimes called standby state
-#
-# Since: 1.1
-##
-{ 'event': 'SUSPEND' }
-
-##
-# @SUSPEND_DISK
-#
-# Emitted when guest enters a hardware suspension state with data saved on
-# disk, for example, S4 state, which is sometimes called hibernate state
-#
-# Note: QEMU shuts down (similar to event @SHUTDOWN) when entering this state
-#
-# Since: 1.2
-##
-{ 'event': 'SUSPEND_DISK' }
-
-##
-# @WAKEUP
-#
-# Emitted when the guest has woken up from suspend state and is running
-#
-# Since: 1.1
-##
-{ 'event': 'WAKEUP' }
-
-##
-# @RTC_CHANGE
-#
-# Emitted when the guest changes the RTC time.
-#
-# @offset: offset between base RTC clock (as specified by -rtc base), and
-#          new RTC clock value
-#
-# Since: 0.13.0
-##
-{ 'event': 'RTC_CHANGE',
-  'data': { 'offset': 'int' } }
-
-##
-# @WATCHDOG
-#
-# Emitted when the watchdog device's timer is expired
-#
-# @action: action that has been taken
-#
-# Note: If action is "reset", "shutdown", or "pause" the WATCHDOG event is
-# followed respectively by the RESET, SHUTDOWN, or STOP events
-#
-# Since: 0.13.0
-##
-{ 'event': 'WATCHDOG',
-  'data': { 'action': 'WatchdogExpirationAction' } }
-
-##
-# @DEVICE_DELETED
-#
-# Emitted whenever the device removal completion is acknowledged by the guest.
-# At this point, it's safe to reuse the specified device ID. Device removal can
-# be initiated by the guest or by HMP/QMP commands.
-#
-# @device: #optional, device name
-#
-# @path: device path
-#
-# Since: 1.5
-##
-{ 'event': 'DEVICE_DELETED',
-  'data': { '*device': 'str', 'path': 'str' } }
-
-##
-# @NIC_RX_FILTER_CHANGED
-#
-# Emitted once until the 'query-rx-filter' command is executed, the first event
-# will always be emitted
-#
-# @name: #optional, net client name
-#
-# @path: device path
-#
-# Since: 1.6
-##
-{ 'event': 'NIC_RX_FILTER_CHANGED',
-  'data': { '*name': 'str', 'path': 'str' } }
-
-##
-# @VNC_CONNECTED
-#
-# Emitted when a VNC client establishes a connection
-#
-# @server: server information
-#
-# @client: client information
-#
-# Note: This event is emitted before any authentication takes place, thus
-# the authentication ID is not provided
-#
-# Since: 0.13.0
-##
-{ 'event': 'VNC_CONNECTED',
-  'data': { 'server': 'VncServerInfo',
-            'client': 'VncBasicInfo' } }
-
-##
-# @VNC_INITIALIZED
-#
-# Emitted after authentication takes place (if any) and the VNC session is
-# made active
-#
-# @server: server information
-#
-# @client: client information
-#
-# Since: 0.13.0
-##
-{ 'event': 'VNC_INITIALIZED',
-  'data': { 'server': 'VncServerInfo',
-            'client': 'VncClientInfo' } }
-
-##
-# @VNC_DISCONNECTED
-#
-# Emitted when the connection is closed
-#
-# @server: server information
-#
-# @client: client information
-#
-# Since: 0.13.0
-##
-{ 'event': 'VNC_DISCONNECTED',
-  'data': { 'server': 'VncServerInfo',
-            'client': 'VncClientInfo' } }
-
-##
-# @SPICE_CONNECTED
-#
-# Emitted when a SPICE client establishes a connection
-#
-# @server: server information
-#
-# @client: client information
-#
-# Since: 0.14.0
-##
-{ 'event': 'SPICE_CONNECTED',
-  'data': { 'server': 'SpiceBasicInfo',
-            'client': 'SpiceBasicInfo' } }
-
-##
-# @SPICE_INITIALIZED
-#
-# Emitted after initial handshake and authentication takes place (if any)
-# and the SPICE channel is up and running
-#
-# @server: server information
-#
-# @client: client information
-#
-# Since: 0.14.0
-##
-{ 'event': 'SPICE_INITIALIZED',
-  'data': { 'server': 'SpiceServerInfo',
-            'client': 'SpiceChannel' } }
-
-##
-# @SPICE_DISCONNECTED
-#
-# Emitted when the SPICE connection is closed
-#
-# @server: server information
-#
-# @client: client information
-#
-# Since: 0.14.0
-##
-{ 'event': 'SPICE_DISCONNECTED',
-  'data': { 'server': 'SpiceBasicInfo',
-            'client': 'SpiceBasicInfo' } }
-
-##
-# @SPICE_MIGRATE_COMPLETED
-#
-# Emitted when SPICE migration has completed
-#
-# Since: 1.3
-##
-{ 'event': 'SPICE_MIGRATE_COMPLETED' }
-
-##
-# @MIGRATION
-#
-# Emitted when a migration event happens
-#
-# @status: @MigrationStatus describing the current migration status.
-#
-# Since: 2.4
-##
-{ 'event': 'MIGRATION',
-  'data': {'status': 'MigrationStatus'}}
-
-##
-# @MIGRATION_PASS
-#
-# Emitted from the source side of a migration at the start of each pass
-# (when it syncs the dirty bitmap)
-#
-# @pass: An incrementing count (starting at 1 on the first pass)
-#
-# Since: 2.6
-##
-{ 'event': 'MIGRATION_PASS',
-  'data': { 'pass': 'int' } }
-
-##
-# @ACPI_DEVICE_OST
-#
-# Emitted when guest executes ACPI _OST method.
-#
-# Since: 2.1
-#
-# @info: ACPIOSTInfo type as described in qapi-schema.json
-##
-{ 'event': 'ACPI_DEVICE_OST',
-     'data': { 'info': 'ACPIOSTInfo' } }
-
-##
-# @BALLOON_CHANGE
-#
-# Emitted when the guest changes the actual BALLOON level. This value is
-# equivalent to the @actual field return by the 'query-balloon' command
-#
-# @actual: actual level of the guest memory balloon in bytes
-#
-# Since: 1.2
-##
-{ 'event': 'BALLOON_CHANGE',
-  'data': { 'actual': 'int' } }
-
-##
-# @GUEST_PANICKED
-#
-# Emitted when guest OS panic is detected
-#
-# @action: action that has been taken, currently always "pause"
-#
-# Since: 1.5
-##
-{ 'event': 'GUEST_PANICKED',
-  'data': { 'action': 'GuestPanicAction' } }
-
-##
-# @QUORUM_FAILURE
-#
-# Emitted by the Quorum block driver if it fails to establish a quorum
-#
-# @reference: device name if defined else node name
-#
-# @sector-num: number of the first sector of the failed read operation
-#
-# @sectors-count: failed read operation sector count
-#
-# Since: 2.0
-##
-{ 'event': 'QUORUM_FAILURE',
-  'data': { 'reference': 'str', 'sector-num': 'int', 'sectors-count': 'int' } }
-
-##
-# @QUORUM_REPORT_BAD
-#
-# Emitted to report a corruption of a Quorum file
-#
-# @type: quorum operation type (Since 2.6)
-#
-# @error: #optional, error message. Only present on failure. This field
-#         contains a human-readable error message. There are no semantics other
-#         than that the block layer reported an error and clients should not
-#         try to interpret the error string.
-#
-# @node-name: the graph node name of the block driver state
-#
-# @sector-num: number of the first sector of the failed read operation
-#
-# @sectors-count: failed read operation sector count
-#
-# Since: 2.0
-##
-{ 'event': 'QUORUM_REPORT_BAD',
-  'data': { 'type': 'QuorumOpType', '*error': 'str', 'node-name': 'str',
-            'sector-num': 'int', 'sectors-count': 'int' } }
-
-##
-# @VSERPORT_CHANGE
-#
-# Emitted when the guest opens or closes a virtio-serial port.
-#
-# @id: device identifier of the virtio-serial port
-#
-# @open: true if the guest has opened the virtio-serial port
-#
-# Since: 2.1
-##
-{ 'event': 'VSERPORT_CHANGE',
-  'data': { 'id': 'str', 'open': 'bool' } }
-
-##
-# @MEM_UNPLUG_ERROR
-#
-# Emitted when memory hot unplug error occurs.
-#
-# @device: device name
-#
-# @msg: Informative message
-#
-# Since: 2.4
-##
-{ 'event': 'MEM_UNPLUG_ERROR',
-  'data': { 'device': 'str', 'msg': 'str' } }
-
-##
-# @DUMP_COMPLETED
-#
-# Emitted when background dump has completed
-#
-# @result: DumpQueryResult type described in qapi-schema.json.
-#
-# @error: #optional human-readable error string that provides
-#         hint on why dump failed. Only presents on failure. The
-#         user should not try to interpret the error string.
-#
-# Since: 2.6
-##
-{ 'event': 'DUMP_COMPLETED' ,
-  'data': { 'result': 'DumpQueryResult', '*error': 'str' } }
diff --git a/qemu/qapi/introspect.json b/qemu/qapi/introspect.json
deleted file mode 100644
index 3fd81fb54..000000000
--- a/qemu/qapi/introspect.json
+++ /dev/null
@@ -1,279 +0,0 @@
-# -*- Mode: Python -*-
-#
-# QAPI/QMP introspection
-#
-# Copyright (C) 2015 Red Hat, Inc.
-#
-# Authors:
-#  Markus Armbruster <armbru@redhat.com>
-#
-# This work is licensed under the terms of the GNU GPL, version 2 or later.
-# See the COPYING file in the top-level directory.
-
-##
-# @query-qmp-schema
-#
-# Command query-qmp-schema exposes the QMP wire ABI as an array of
-# SchemaInfo.  This lets QMP clients figure out what commands and
-# events are available in this QEMU, and their parameters and results.
-#
-# However, the SchemaInfo can't reflect all the rules and restrictions
-# that apply to QMP.  It's interface introspection (figuring out
-# what's there), not interface specification.  The specification is in
-# the QAPI schema.
-#
-# Furthermore, while we strive to keep the QMP wire format
-# backwards-compatible across qemu versions, the introspection output
-# is not guaranteed to have the same stability.  For example, one
-# version of qemu may list an object member as an optional
-# non-variant, while another lists the same member only through the
-# object's variants; or the type of a member may change from a generic
-# string into a specific enum or from one specific type into an
-# alternate that includes the original type alongside something else.
-#
-# Returns: array of @SchemaInfo, where each element describes an
-# entity in the ABI: command, event, type, ...
-#
-# The order of the various SchemaInfo is unspecified; however, all
-# names are guaranteed to be unique (no name will be duplicated with
-# different meta-types).
-#
-# Note: the QAPI schema is also used to help define *internal*
-# interfaces, by defining QAPI types.  These are not part of the QMP
-# wire ABI, and therefore not returned by this command.
-#
-# Since: 2.5
-##
-{ 'command': 'query-qmp-schema',
-  'returns': [ 'SchemaInfo' ],
-  'gen': false }                # just to simplify qmp_query_json()
-
-##
-# @SchemaMetaType
-#
-# This is a @SchemaInfo's meta type, i.e. the kind of entity it
-# describes.
-#
-# @builtin: a predefined type such as 'int' or 'bool'.
-#
-# @enum: an enumeration type
-#
-# @array: an array type
-#
-# @object: an object type (struct or union)
-#
-# @alternate: an alternate type
-#
-# @command: a QMP command
-#
-# @event: a QMP event
-#
-# Since: 2.5
-##
-{ 'enum': 'SchemaMetaType',
-  'data': [ 'builtin', 'enum', 'array', 'object', 'alternate',
-            'command', 'event' ] }
-
-##
-# @SchemaInfo
-#
-# @name: the entity's name, inherited from @base.
-#        Commands and events have the name defined in the QAPI schema.
-#        Unlike command and event names, type names are not part of
-#        the wire ABI.  Consequently, type names are meaningless
-#        strings here, although they are still guaranteed unique
-#        regardless of @meta-type.
-#
-# All references to other SchemaInfo are by name.
-#
-# @meta-type: the entity's meta type, inherited from @base.
-#
-# Additional members depend on the value of @meta-type.
-#
-# Since: 2.5
-##
-{ 'union': 'SchemaInfo',
-  'base': { 'name': 'str', 'meta-type': 'SchemaMetaType' },
-  'discriminator': 'meta-type',
-  'data': {
-      'builtin': 'SchemaInfoBuiltin',
-      'enum': 'SchemaInfoEnum',
-      'array': 'SchemaInfoArray',
-      'object': 'SchemaInfoObject',
-      'alternate': 'SchemaInfoAlternate',
-      'command': 'SchemaInfoCommand',
-      'event': 'SchemaInfoEvent' } }
-
-##
-# @SchemaInfoBuiltin
-#
-# Additional SchemaInfo members for meta-type 'builtin'.
-#
-# @json-type: the JSON type used for this type on the wire.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoBuiltin',
-  'data': { 'json-type': 'JSONType' } }
-
-##
-# @JSONType
-#
-# The four primitive and two structured types according to RFC 7159
-# section 1, plus 'int' (split off 'number'), plus the obvious top
-# type 'value'.
-#
-# Since: 2.5
-##
-{ 'enum': 'JSONType',
-  'data': [ 'string', 'number', 'int', 'boolean', 'null',
-            'object', 'array', 'value' ] }
-
-##
-# @SchemaInfoEnum
-#
-# Additional SchemaInfo members for meta-type 'enum'.
-#
-# @values: the enumeration type's values, in no particular order.
-#
-# Values of this type are JSON string on the wire.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoEnum',
-  'data': { 'values': ['str'] } }
-
-##
-# @SchemaInfoArray
-#
-# Additional SchemaInfo members for meta-type 'array'.
-#
-# @element-type: the array type's element type.
-#
-# Values of this type are JSON array on the wire.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoArray',
-  'data': { 'element-type': 'str' } }
-
-##
-# @SchemaInfoObject
-#
-# Additional SchemaInfo members for meta-type 'object'.
-#
-# @members: the object type's (non-variant) members, in no particular order.
-#
-# @tag: #optional the name of the member serving as type tag.
-#       An element of @members with this name must exist.
-#
-# @variants: #optional variant members, i.e. additional members that
-#            depend on the type tag's value.  Present exactly when
-#            @tag is present.  The variants are in no particular order,
-#            and may even differ from the order of the values of the
-#            enum type of the @tag.
-#
-# Values of this type are JSON object on the wire.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoObject',
-  'data': { 'members': [ 'SchemaInfoObjectMember' ],
-            '*tag': 'str',
-            '*variants': [ 'SchemaInfoObjectVariant' ] } }
-
-##
-# @SchemaInfoObjectMember
-#
-# An object member.
-#
-# @name: the member's name, as defined in the QAPI schema.
-#
-# @type: the name of the member's type.
-#
-# @default: #optional default when used as command parameter.
-#           If absent, the parameter is mandatory.
-#           If present, the value must be null.  The parameter is
-#           optional, and behavior when it's missing is not specified
-#           here.
-#           Future extension: if present and non-null, the parameter
-#           is optional, and defaults to this value.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoObjectMember',
-  'data': { 'name': 'str', 'type': 'str', '*default': 'any' } }
-# @default's type must be null or match @type
-
-##
-# @SchemaInfoObjectVariant
-#
-# The variant members for a value of the type tag.
-#
-# @case: a value of the type tag.
-#
-# @type: the name of the object type that provides the variant members
-#        when the type tag has value @case.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoObjectVariant',
-  'data': { 'case': 'str', 'type': 'str' } }
-
-##
-# @SchemaInfoAlternate
-#
-# Additional SchemaInfo members for meta-type 'alternate'.
-#
-# @members: the alternate type's members, in no particular order.
-#           The members' wire encoding is distinct, see
-#           docs/qapi-code-gen.txt section Alternate types.
-#
-# On the wire, this can be any of the members.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoAlternate',
-  'data': { 'members': [ 'SchemaInfoAlternateMember' ] } }
-
-##
-# @SchemaInfoAlternateMember
-#
-# An alternate member.
-#
-# @type: the name of the member's type.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoAlternateMember',
-  'data': { 'type': 'str' } }
-
-##
-# @SchemaInfoCommand
-#
-# Additional SchemaInfo members for meta-type 'command'.
-#
-# @arg-type: the name of the object type that provides the command's
-#            parameters.
-#
-# @ret-type: the name of the command's result type.
-#
-# TODO @success-response (currently irrelevant, because it's QGA, not QMP)
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoCommand',
-  'data': { 'arg-type': 'str', 'ret-type': 'str' } }
-
-##
-# @SchemaInfoEvent
-#
-# Additional SchemaInfo members for meta-type 'event'.
-#
-# @arg-type: the name of the object type that provides the event's
-#            parameters.
-#
-# Since: 2.5
-##
-{ 'struct': 'SchemaInfoEvent',
-  'data': { 'arg-type': 'str' } }
diff --git a/qemu/qapi/opts-visitor.c b/qemu/qapi/opts-visitor.c
deleted file mode 100644
index 602f2609c..000000000
--- a/qemu/qapi/opts-visitor.c
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * Options Visitor
- *
- * Copyright Red Hat, Inc. 2012-2016
- *
- * Author: Laszlo Ersek <lersek@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qemu/cutils.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/opts-visitor.h"
-#include "qemu/queue.h"
-#include "qemu/option_int.h"
-#include "qapi/visitor-impl.h"
-
-
-enum ListMode
-{
-    LM_NONE,             /* not traversing a list of repeated options */
-    LM_STARTED,          /* opts_start_list() succeeded */
-
-    LM_IN_PROGRESS,      /* opts_next_list() has been called.
-                          *
-                          * Generating the next list link will consume the most
-                          * recently parsed QemuOpt instance of the repeated
-                          * option.
-                          *
-                          * Parsing a value into the list link will examine the
-                          * next QemuOpt instance of the repeated option, and
-                          * possibly enter LM_SIGNED_INTERVAL or
-                          * LM_UNSIGNED_INTERVAL.
-                          */
-
-    LM_SIGNED_INTERVAL,  /* opts_next_list() has been called.
-                          *
-                          * Generating the next list link will consume the most
-                          * recently stored element from the signed interval,
-                          * parsed from the most recent QemuOpt instance of the
-                          * repeated option. This may consume QemuOpt itself
-                          * and return to LM_IN_PROGRESS.
-                          *
-                          * Parsing a value into the list link will store the
-                          * next element of the signed interval.
-                          */
-
-    LM_UNSIGNED_INTERVAL /* Same as above, only for an unsigned interval. */
-};
-
-typedef enum ListMode ListMode;
-
-struct OptsVisitor
-{
-    Visitor visitor;
-
-    /* Ownership remains with opts_visitor_new()'s caller. */
-    const QemuOpts *opts_root;
-
-    unsigned depth;
-
-    /* Non-null iff depth is positive. Each key is a QemuOpt name. Each value
-     * is a non-empty GQueue, enumerating all QemuOpt occurrences with that
-     * name. */
-    GHashTable *unprocessed_opts;
-
-    /* The list currently being traversed with opts_start_list() /
-     * opts_next_list(). The list must have a struct element type in the
-     * schema, with a single mandatory scalar member. */
-    ListMode list_mode;
-    GQueue *repeated_opts;
-
-    /* When parsing a list of repeating options as integers, values of the form
-     * "a-b", representing a closed interval, are allowed. Elements in the
-     * range are generated individually.
-     */
-    union {
-        int64_t s;
-        uint64_t u;
-    } range_next, range_limit;
-
-    /* If "opts_root->id" is set, reinstantiate it as a fake QemuOpt for
-     * uniformity. Only its "name" and "str" fields are set. "fake_id_opt" does
-     * not survive or escape the OptsVisitor object.
-     */
-    QemuOpt *fake_id_opt;
-};
-
-
-static OptsVisitor *to_ov(Visitor *v)
-{
-    return container_of(v, OptsVisitor, visitor);
-}
-
-
-static void
-destroy_list(gpointer list)
-{
-  g_queue_free(list);
-}
-
-
-static void
-opts_visitor_insert(GHashTable *unprocessed_opts, const QemuOpt *opt)
-{
-    GQueue *list;
-
-    list = g_hash_table_lookup(unprocessed_opts, opt->name);
-    if (list == NULL) {
-        list = g_queue_new();
-
-        /* GHashTable will never try to free the keys -- we supply NULL as
-         * "key_destroy_func" in opts_start_struct(). Thus cast away key
-         * const-ness in order to suppress gcc's warning.
-         */
-        g_hash_table_insert(unprocessed_opts, (gpointer)opt->name, list);
-    }
-
-    /* Similarly, destroy_list() doesn't call g_queue_free_full(). */
-    g_queue_push_tail(list, (gpointer)opt);
-}
-
-
-static void
-opts_start_struct(Visitor *v, const char *name, void **obj,
-                  size_t size, Error **errp)
-{
-    OptsVisitor *ov = to_ov(v);
-    const QemuOpt *opt;
-
-    if (obj) {
-        *obj = g_malloc0(size > 0 ? size : 1);
-    }
-    if (ov->depth++ > 0) {
-        return;
-    }
-
-    ov->unprocessed_opts = g_hash_table_new_full(&g_str_hash, &g_str_equal,
-                                                 NULL, &destroy_list);
-    QTAILQ_FOREACH(opt, &ov->opts_root->head, next) {
-        /* ensured by qemu-option.c::opts_do_parse() */
-        assert(strcmp(opt->name, "id") != 0);
-
-        opts_visitor_insert(ov->unprocessed_opts, opt);
-    }
-
-    if (ov->opts_root->id != NULL) {
-        ov->fake_id_opt = g_malloc0(sizeof *ov->fake_id_opt);
-
-        ov->fake_id_opt->name = g_strdup("id");
-        ov->fake_id_opt->str = g_strdup(ov->opts_root->id);
-        opts_visitor_insert(ov->unprocessed_opts, ov->fake_id_opt);
-    }
-}
-
-
-static void
-opts_end_struct(Visitor *v, Error **errp)
-{
-    OptsVisitor *ov = to_ov(v);
-    GHashTableIter iter;
-    GQueue *any;
-
-    if (--ov->depth > 0) {
-        return;
-    }
-
-    /* we should have processed all (distinct) QemuOpt instances */
-    g_hash_table_iter_init(&iter, ov->unprocessed_opts);
-    if (g_hash_table_iter_next(&iter, NULL, (void **)&any)) {
-        const QemuOpt *first;
-
-        first = g_queue_peek_head(any);
-        error_setg(errp, QERR_INVALID_PARAMETER, first->name);
-    }
-    g_hash_table_destroy(ov->unprocessed_opts);
-    ov->unprocessed_opts = NULL;
-    if (ov->fake_id_opt) {
-        g_free(ov->fake_id_opt->name);
-        g_free(ov->fake_id_opt->str);
-        g_free(ov->fake_id_opt);
-    }
-    ov->fake_id_opt = NULL;
-}
-
-
-static GQueue *
-lookup_distinct(const OptsVisitor *ov, const char *name, Error **errp)
-{
-    GQueue *list;
-
-    list = g_hash_table_lookup(ov->unprocessed_opts, name);
-    if (!list) {
-        error_setg(errp, QERR_MISSING_PARAMETER, name);
-    }
-    return list;
-}
-
-
-static void
-opts_start_list(Visitor *v, const char *name, Error **errp)
-{
-    OptsVisitor *ov = to_ov(v);
-
-    /* we can't traverse a list in a list */
-    assert(ov->list_mode == LM_NONE);
-    ov->repeated_opts = lookup_distinct(ov, name, errp);
-    if (ov->repeated_opts != NULL) {
-        ov->list_mode = LM_STARTED;
-    }
-}
-
-
-static GenericList *
-opts_next_list(Visitor *v, GenericList **list, size_t size)
-{
-    OptsVisitor *ov = to_ov(v);
-    GenericList **link;
-
-    switch (ov->list_mode) {
-    case LM_STARTED:
-        ov->list_mode = LM_IN_PROGRESS;
-        link = list;
-        break;
-
-    case LM_SIGNED_INTERVAL:
-    case LM_UNSIGNED_INTERVAL:
-        link = &(*list)->next;
-
-        if (ov->list_mode == LM_SIGNED_INTERVAL) {
-            if (ov->range_next.s < ov->range_limit.s) {
-                ++ov->range_next.s;
-                break;
-            }
-        } else if (ov->range_next.u < ov->range_limit.u) {
-            ++ov->range_next.u;
-            break;
-        }
-        ov->list_mode = LM_IN_PROGRESS;
-        /* range has been completed, fall through in order to pop option */
-
-    case LM_IN_PROGRESS: {
-        const QemuOpt *opt;
-
-        opt = g_queue_pop_head(ov->repeated_opts);
-        if (g_queue_is_empty(ov->repeated_opts)) {
-            g_hash_table_remove(ov->unprocessed_opts, opt->name);
-            return NULL;
-        }
-        link = &(*list)->next;
-        break;
-    }
-
-    default:
-        abort();
-    }
-
-    *link = g_malloc0(size);
-    return *link;
-}
-
-
-static void
-opts_end_list(Visitor *v)
-{
-    OptsVisitor *ov = to_ov(v);
-
-    assert(ov->list_mode == LM_STARTED ||
-           ov->list_mode == LM_IN_PROGRESS ||
-           ov->list_mode == LM_SIGNED_INTERVAL ||
-           ov->list_mode == LM_UNSIGNED_INTERVAL);
-    ov->repeated_opts = NULL;
-    ov->list_mode = LM_NONE;
-}
-
-
-static const QemuOpt *
-lookup_scalar(const OptsVisitor *ov, const char *name, Error **errp)
-{
-    if (ov->list_mode == LM_NONE) {
-        GQueue *list;
-
-        /* the last occurrence of any QemuOpt takes effect when queried by name
-         */
-        list = lookup_distinct(ov, name, errp);
-        return list ? g_queue_peek_tail(list) : NULL;
-    }
-    assert(ov->list_mode == LM_IN_PROGRESS);
-    return g_queue_peek_head(ov->repeated_opts);
-}
-
-
-static void
-processed(OptsVisitor *ov, const char *name)
-{
-    if (ov->list_mode == LM_NONE) {
-        g_hash_table_remove(ov->unprocessed_opts, name);
-        return;
-    }
-    assert(ov->list_mode == LM_IN_PROGRESS);
-    /* do nothing */
-}
-
-
-static void
-opts_type_str(Visitor *v, const char *name, char **obj, Error **errp)
-{
-    OptsVisitor *ov = to_ov(v);
-    const QemuOpt *opt;
-
-    opt = lookup_scalar(ov, name, errp);
-    if (!opt) {
-        return;
-    }
-    *obj = g_strdup(opt->str ? opt->str : "");
-    processed(ov, name);
-}
-
-
-/* mimics qemu-option.c::parse_option_bool() */
-static void
-opts_type_bool(Visitor *v, const char *name, bool *obj, Error **errp)
-{
-    OptsVisitor *ov = to_ov(v);
-    const QemuOpt *opt;
-
-    opt = lookup_scalar(ov, name, errp);
-    if (!opt) {
-        return;
-    }
-
-    if (opt->str) {
-        if (strcmp(opt->str, "on") == 0 ||
-            strcmp(opt->str, "yes") == 0 ||
-            strcmp(opt->str, "y") == 0) {
-            *obj = true;
-        } else if (strcmp(opt->str, "off") == 0 ||
-            strcmp(opt->str, "no") == 0 ||
-            strcmp(opt->str, "n") == 0) {
-            *obj = false;
-        } else {
-            error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
-                       "on|yes|y|off|no|n");
-            return;
-        }
-    } else {
-        *obj = true;
-    }
-
-    processed(ov, name);
-}
-
-
-static void
-opts_type_int64(Visitor *v, const char *name, int64_t *obj, Error **errp)
-{
-    OptsVisitor *ov = to_ov(v);
-    const QemuOpt *opt;
-    const char *str;
-    long long val;
-    char *endptr;
-
-    if (ov->list_mode == LM_SIGNED_INTERVAL) {
-        *obj = ov->range_next.s;
-        return;
-    }
-
-    opt = lookup_scalar(ov, name, errp);
-    if (!opt) {
-        return;
-    }
-    str = opt->str ? opt->str : "";
-
-    /* we've gotten past lookup_scalar() */
-    assert(ov->list_mode == LM_NONE || ov->list_mode == LM_IN_PROGRESS);
-
-    errno = 0;
-    val = strtoll(str, &endptr, 0);
-    if (errno == 0 && endptr > str && INT64_MIN <= val && val <= INT64_MAX) {
-        if (*endptr == '\0') {
-            *obj = val;
-            processed(ov, name);
-            return;
-        }
-        if (*endptr == '-' && ov->list_mode == LM_IN_PROGRESS) {
-            long long val2;
-
-            str = endptr + 1;
-            val2 = strtoll(str, &endptr, 0);
-            if (errno == 0 && endptr > str && *endptr == '\0' &&
-                INT64_MIN <= val2 && val2 <= INT64_MAX && val <= val2 &&
-                (val > INT64_MAX - OPTS_VISITOR_RANGE_MAX ||
-                 val2 < val + OPTS_VISITOR_RANGE_MAX)) {
-                ov->range_next.s = val;
-                ov->range_limit.s = val2;
-                ov->list_mode = LM_SIGNED_INTERVAL;
-
-                /* as if entering on the top */
-                *obj = ov->range_next.s;
-                return;
-            }
-        }
-    }
-    error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
-               (ov->list_mode == LM_NONE) ? "an int64 value" :
-                                            "an int64 value or range");
-}
-
-
-static void
-opts_type_uint64(Visitor *v, const char *name, uint64_t *obj, Error **errp)
-{
-    OptsVisitor *ov = to_ov(v);
-    const QemuOpt *opt;
-    const char *str;
-    unsigned long long val;
-    char *endptr;
-
-    if (ov->list_mode == LM_UNSIGNED_INTERVAL) {
-        *obj = ov->range_next.u;
-        return;
-    }
-
-    opt = lookup_scalar(ov, name, errp);
-    if (!opt) {
-        return;
-    }
-    str = opt->str;
-
-    /* we've gotten past lookup_scalar() */
-    assert(ov->list_mode == LM_NONE || ov->list_mode == LM_IN_PROGRESS);
-
-    if (parse_uint(str, &val, &endptr, 0) == 0 && val <= UINT64_MAX) {
-        if (*endptr == '\0') {
-            *obj = val;
-            processed(ov, name);
-            return;
-        }
-        if (*endptr == '-' && ov->list_mode == LM_IN_PROGRESS) {
-            unsigned long long val2;
-
-            str = endptr + 1;
-            if (parse_uint_full(str, &val2, 0) == 0 &&
-                val2 <= UINT64_MAX && val <= val2 &&
-                val2 - val < OPTS_VISITOR_RANGE_MAX) {
-                ov->range_next.u = val;
-                ov->range_limit.u = val2;
-                ov->list_mode = LM_UNSIGNED_INTERVAL;
-
-                /* as if entering on the top */
-                *obj = ov->range_next.u;
-                return;
-            }
-        }
-    }
-    error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
-               (ov->list_mode == LM_NONE) ? "a uint64 value" :
-                                            "a uint64 value or range");
-}
-
-
-static void
-opts_type_size(Visitor *v, const char *name, uint64_t *obj, Error **errp)
-{
-    OptsVisitor *ov = to_ov(v);
-    const QemuOpt *opt;
-    int64_t val;
-    char *endptr;
-
-    opt = lookup_scalar(ov, name, errp);
-    if (!opt) {
-        return;
-    }
-
-    val = qemu_strtosz_suffix(opt->str ? opt->str : "", &endptr,
-                         QEMU_STRTOSZ_DEFSUFFIX_B);
-    if (val < 0 || *endptr) {
-        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
-                   "a size value representible as a non-negative int64");
-        return;
-    }
-
-    *obj = val;
-    processed(ov, name);
-}
-
-
-static void
-opts_optional(Visitor *v, const char *name, bool *present)
-{
-    OptsVisitor *ov = to_ov(v);
-
-    /* we only support a single mandatory scalar field in a list node */
-    assert(ov->list_mode == LM_NONE);
-    *present = (lookup_distinct(ov, name, NULL) != NULL);
-}
-
-
-OptsVisitor *
-opts_visitor_new(const QemuOpts *opts)
-{
-    OptsVisitor *ov;
-
-    ov = g_malloc0(sizeof *ov);
-
-    ov->visitor.start_struct = &opts_start_struct;
-    ov->visitor.end_struct   = &opts_end_struct;
-
-    ov->visitor.start_list = &opts_start_list;
-    ov->visitor.next_list  = &opts_next_list;
-    ov->visitor.end_list   = &opts_end_list;
-
-    /* input_type_enum() covers both "normal" enums and union discriminators.
-     * The union discriminator field is always generated as "type"; it should
-     * match the "type" QemuOpt child of any QemuOpts.
-     *
-     * input_type_enum() will remove the looked-up key from the
-     * "unprocessed_opts" hash even if the lookup fails, because the removal is
-     * done earlier in opts_type_str(). This should be harmless.
-     */
-    ov->visitor.type_enum = &input_type_enum;
-
-    ov->visitor.type_int64  = &opts_type_int64;
-    ov->visitor.type_uint64 = &opts_type_uint64;
-    ov->visitor.type_size   = &opts_type_size;
-    ov->visitor.type_bool   = &opts_type_bool;
-    ov->visitor.type_str    = &opts_type_str;
-
-    /* type_number() is not filled in, but this is not the first visitor to
-     * skip some mandatory methods... */
-
-    ov->visitor.optional = &opts_optional;
-
-    ov->opts_root = opts;
-
-    return ov;
-}
-
-
-void
-opts_visitor_cleanup(OptsVisitor *ov)
-{
-    if (ov->unprocessed_opts != NULL) {
-        g_hash_table_destroy(ov->unprocessed_opts);
-    }
-    g_free(ov->fake_id_opt);
-    g_free(ov);
-}
-
-
-Visitor *
-opts_get_visitor(OptsVisitor *ov)
-{
-    return &ov->visitor;
-}
diff --git a/qemu/qapi/qapi-dealloc-visitor.c b/qemu/qapi/qapi-dealloc-visitor.c
deleted file mode 100644
index 69221794e..000000000
--- a/qemu/qapi/qapi-dealloc-visitor.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Dealloc Visitor
- *
- * Copyright (C) 2012-2016 Red Hat, Inc.
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Michael Roth   <mdroth@linux.vnet.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qapi/dealloc-visitor.h"
-#include "qemu/queue.h"
-#include "qemu-common.h"
-#include "qapi/qmp/types.h"
-#include "qapi/visitor-impl.h"
-
-typedef struct StackEntry
-{
-    void *value;
-    bool is_list_head;
-    QTAILQ_ENTRY(StackEntry) node;
-} StackEntry;
-
-struct QapiDeallocVisitor
-{
-    Visitor visitor;
-    QTAILQ_HEAD(, StackEntry) stack;
-};
-
-static QapiDeallocVisitor *to_qov(Visitor *v)
-{
-    return container_of(v, QapiDeallocVisitor, visitor);
-}
-
-static void qapi_dealloc_push(QapiDeallocVisitor *qov, void *value)
-{
-    StackEntry *e = g_malloc0(sizeof(*e));
-
-    e->value = value;
-
-    /* see if we're just pushing a list head tracker */
-    if (value == NULL) {
-        e->is_list_head = true;
-    }
-    QTAILQ_INSERT_HEAD(&qov->stack, e, node);
-}
-
-static void *qapi_dealloc_pop(QapiDeallocVisitor *qov)
-{
-    StackEntry *e = QTAILQ_FIRST(&qov->stack);
-    QObject *value;
-    QTAILQ_REMOVE(&qov->stack, e, node);
-    value = e->value;
-    g_free(e);
-    return value;
-}
-
-static void qapi_dealloc_start_struct(Visitor *v, const char *name, void **obj,
-                                      size_t unused, Error **errp)
-{
-    QapiDeallocVisitor *qov = to_qov(v);
-    qapi_dealloc_push(qov, obj);
-}
-
-static void qapi_dealloc_end_struct(Visitor *v, Error **errp)
-{
-    QapiDeallocVisitor *qov = to_qov(v);
-    void **obj = qapi_dealloc_pop(qov);
-    if (obj) {
-        g_free(*obj);
-    }
-}
-
-static void qapi_dealloc_start_alternate(Visitor *v, const char *name,
-                                         GenericAlternate **obj, size_t size,
-                                         bool promote_int, Error **errp)
-{
-    QapiDeallocVisitor *qov = to_qov(v);
-    qapi_dealloc_push(qov, obj);
-}
-
-static void qapi_dealloc_end_alternate(Visitor *v)
-{
-    QapiDeallocVisitor *qov = to_qov(v);
-    void **obj = qapi_dealloc_pop(qov);
-    if (obj) {
-        g_free(*obj);
-    }
-}
-
-static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp)
-{
-    QapiDeallocVisitor *qov = to_qov(v);
-    qapi_dealloc_push(qov, NULL);
-}
-
-static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,
-                                           size_t size)
-{
-    GenericList *list = *listp;
-    QapiDeallocVisitor *qov = to_qov(v);
-    StackEntry *e = QTAILQ_FIRST(&qov->stack);
-
-    if (e && e->is_list_head) {
-        e->is_list_head = false;
-        return list;
-    }
-
-    if (list) {
-        list = list->next;
-        g_free(*listp);
-        return list;
-    }
-
-    return NULL;
-}
-
-static void qapi_dealloc_end_list(Visitor *v)
-{
-    QapiDeallocVisitor *qov = to_qov(v);
-    void *obj = qapi_dealloc_pop(qov);
-    assert(obj == NULL); /* should've been list head tracker with no payload */
-}
-
-static void qapi_dealloc_type_str(Visitor *v, const char *name, char **obj,
-                                  Error **errp)
-{
-    if (obj) {
-        g_free(*obj);
-    }
-}
-
-static void qapi_dealloc_type_int64(Visitor *v, const char *name, int64_t *obj,
-                                    Error **errp)
-{
-}
-
-static void qapi_dealloc_type_uint64(Visitor *v, const char *name,
-                                     uint64_t *obj, Error **errp)
-{
-}
-
-static void qapi_dealloc_type_bool(Visitor *v, const char *name, bool *obj,
-                                   Error **errp)
-{
-}
-
-static void qapi_dealloc_type_number(Visitor *v, const char *name, double *obj,
-                                     Error **errp)
-{
-}
-
-static void qapi_dealloc_type_anything(Visitor *v, const char *name,
-                                       QObject **obj, Error **errp)
-{
-    if (obj) {
-        qobject_decref(*obj);
-    }
-}
-
-static void qapi_dealloc_type_enum(Visitor *v, const char *name, int *obj,
-                                   const char * const strings[], Error **errp)
-{
-}
-
-Visitor *qapi_dealloc_get_visitor(QapiDeallocVisitor *v)
-{
-    return &v->visitor;
-}
-
-void qapi_dealloc_visitor_cleanup(QapiDeallocVisitor *v)
-{
-    g_free(v);
-}
-
-QapiDeallocVisitor *qapi_dealloc_visitor_new(void)
-{
-    QapiDeallocVisitor *v;
-
-    v = g_malloc0(sizeof(*v));
-
-    v->visitor.start_struct = qapi_dealloc_start_struct;
-    v->visitor.end_struct = qapi_dealloc_end_struct;
-    v->visitor.start_alternate = qapi_dealloc_start_alternate;
-    v->visitor.end_alternate = qapi_dealloc_end_alternate;
-    v->visitor.start_list = qapi_dealloc_start_list;
-    v->visitor.next_list = qapi_dealloc_next_list;
-    v->visitor.end_list = qapi_dealloc_end_list;
-    v->visitor.type_enum = qapi_dealloc_type_enum;
-    v->visitor.type_int64 = qapi_dealloc_type_int64;
-    v->visitor.type_uint64 = qapi_dealloc_type_uint64;
-    v->visitor.type_bool = qapi_dealloc_type_bool;
-    v->visitor.type_str = qapi_dealloc_type_str;
-    v->visitor.type_number = qapi_dealloc_type_number;
-    v->visitor.type_any = qapi_dealloc_type_anything;
-
-    QTAILQ_INIT(&v->stack);
-
-    return v;
-}
diff --git a/qemu/qapi/qapi-util.c b/qemu/qapi/qapi-util.c
deleted file mode 100644
index 818730a66..000000000
--- a/qemu/qapi/qapi-util.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * QAPI util functions
- *
- * Authors:
- *  Hu Tao       <hutao@cn.fujitsu.com>
- *  Peter Lieven <pl@kamp.de>
- * 
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qemu-common.h"
-#include "qapi/util.h"
-
-int qapi_enum_parse(const char * const lookup[], const char *buf,
-                    int max, int def, Error **errp)
-{
-    int i;
-
-    if (!buf) {
-        return def;
-    }
-
-    for (i = 0; i < max; i++) {
-        if (!strcmp(buf, lookup[i])) {
-            return i;
-        }
-    }
-
-    error_setg(errp, "invalid parameter value: %s", buf);
-    return def;
-}
diff --git a/qemu/qapi/qapi-visit-core.c b/qemu/qapi/qapi-visit-core.c
deleted file mode 100644
index fa680c999..000000000
--- a/qemu/qapi/qapi-visit-core.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Core Definitions for QAPI Visitor Classes
- *
- * Copyright (C) 2012-2016 Red Hat, Inc.
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qemu-common.h"
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/visitor.h"
-#include "qapi/visitor-impl.h"
-
-void visit_start_struct(Visitor *v, const char *name, void **obj,
-                        size_t size, Error **errp)
-{
-    v->start_struct(v, name, obj, size, errp);
-}
-
-void visit_end_struct(Visitor *v, Error **errp)
-{
-    v->end_struct(v, errp);
-}
-
-void visit_start_list(Visitor *v, const char *name, Error **errp)
-{
-    v->start_list(v, name, errp);
-}
-
-GenericList *visit_next_list(Visitor *v, GenericList **list, size_t size)
-{
-    assert(list && size >= sizeof(GenericList));
-    return v->next_list(v, list, size);
-}
-
-void visit_end_list(Visitor *v)
-{
-    v->end_list(v);
-}
-
-void visit_start_alternate(Visitor *v, const char *name,
-                           GenericAlternate **obj, size_t size,
-                           bool promote_int, Error **errp)
-{
-    assert(obj && size >= sizeof(GenericAlternate));
-    if (v->start_alternate) {
-        v->start_alternate(v, name, obj, size, promote_int, errp);
-    }
-}
-
-void visit_end_alternate(Visitor *v)
-{
-    if (v->end_alternate) {
-        v->end_alternate(v);
-    }
-}
-
-bool visit_optional(Visitor *v, const char *name, bool *present)
-{
-    if (v->optional) {
-        v->optional(v, name, present);
-    }
-    return *present;
-}
-
-void visit_type_enum(Visitor *v, const char *name, int *obj,
-                     const char *const strings[], Error **errp)
-{
-    v->type_enum(v, name, obj, strings, errp);
-}
-
-void visit_type_int(Visitor *v, const char *name, int64_t *obj, Error **errp)
-{
-    v->type_int64(v, name, obj, errp);
-}
-
-static void visit_type_uintN(Visitor *v, uint64_t *obj, const char *name,
-                             uint64_t max, const char *type, Error **errp)
-{
-    Error *err = NULL;
-    uint64_t value = *obj;
-
-    v->type_uint64(v, name, &value, &err);
-    if (err) {
-        error_propagate(errp, err);
-    } else if (value > max) {
-        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-                   name ? name : "null", type);
-    } else {
-        *obj = value;
-    }
-}
-
-void visit_type_uint8(Visitor *v, const char *name, uint8_t *obj,
-                      Error **errp)
-{
-    uint64_t value = *obj;
-    visit_type_uintN(v, &value, name, UINT8_MAX, "uint8_t", errp);
-    *obj = value;
-}
-
-void visit_type_uint16(Visitor *v, const char *name, uint16_t *obj,
-                       Error **errp)
-{
-    uint64_t value = *obj;
-    visit_type_uintN(v, &value, name, UINT16_MAX, "uint16_t", errp);
-    *obj = value;
-}
-
-void visit_type_uint32(Visitor *v, const char *name, uint32_t *obj,
-                       Error **errp)
-{
-    uint64_t value = *obj;
-    visit_type_uintN(v, &value, name, UINT32_MAX, "uint32_t", errp);
-    *obj = value;
-}
-
-void visit_type_uint64(Visitor *v, const char *name, uint64_t *obj,
-                       Error **errp)
-{
-    v->type_uint64(v, name, obj, errp);
-}
-
-static void visit_type_intN(Visitor *v, int64_t *obj, const char *name,
-                            int64_t min, int64_t max, const char *type,
-                            Error **errp)
-{
-    Error *err = NULL;
-    int64_t value = *obj;
-
-    v->type_int64(v, name, &value, &err);
-    if (err) {
-        error_propagate(errp, err);
-    } else if (value < min || value > max) {
-        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-                   name ? name : "null", type);
-    } else {
-        *obj = value;
-    }
-}
-
-void visit_type_int8(Visitor *v, const char *name, int8_t *obj, Error **errp)
-{
-    int64_t value = *obj;
-    visit_type_intN(v, &value, name, INT8_MIN, INT8_MAX, "int8_t", errp);
-    *obj = value;
-}
-
-void visit_type_int16(Visitor *v, const char *name, int16_t *obj,
-                      Error **errp)
-{
-    int64_t value = *obj;
-    visit_type_intN(v, &value, name, INT16_MIN, INT16_MAX, "int16_t", errp);
-    *obj = value;
-}
-
-void visit_type_int32(Visitor *v, const char *name, int32_t *obj,
-                      Error **errp)
-{
-    int64_t value = *obj;
-    visit_type_intN(v, &value, name, INT32_MIN, INT32_MAX, "int32_t", errp);
-    *obj = value;
-}
-
-void visit_type_int64(Visitor *v, const char *name, int64_t *obj,
-                      Error **errp)
-{
-    v->type_int64(v, name, obj, errp);
-}
-
-void visit_type_size(Visitor *v, const char *name, uint64_t *obj,
-                     Error **errp)
-{
-    if (v->type_size) {
-        v->type_size(v, name, obj, errp);
-    } else {
-        v->type_uint64(v, name, obj, errp);
-    }
-}
-
-void visit_type_bool(Visitor *v, const char *name, bool *obj, Error **errp)
-{
-    v->type_bool(v, name, obj, errp);
-}
-
-void visit_type_str(Visitor *v, const char *name, char **obj, Error **errp)
-{
-    v->type_str(v, name, obj, errp);
-}
-
-void visit_type_number(Visitor *v, const char *name, double *obj,
-                       Error **errp)
-{
-    v->type_number(v, name, obj, errp);
-}
-
-void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp)
-{
-    v->type_any(v, name, obj, errp);
-}
-
-void output_type_enum(Visitor *v, const char *name, int *obj,
-                      const char *const strings[], Error **errp)
-{
-    int i = 0;
-    int value = *obj;
-    char *enum_str;
-
-    assert(strings);
-    while (strings[i++] != NULL);
-    if (value < 0 || value >= i - 1) {
-        error_setg(errp, QERR_INVALID_PARAMETER, name ? name : "null");
-        return;
-    }
-
-    enum_str = (char *)strings[value];
-    visit_type_str(v, name, &enum_str, errp);
-}
-
-void input_type_enum(Visitor *v, const char *name, int *obj,
-                     const char *const strings[], Error **errp)
-{
-    Error *local_err = NULL;
-    int64_t value = 0;
-    char *enum_str;
-
-    assert(strings);
-
-    visit_type_str(v, name, &enum_str, &local_err);
-    if (local_err) {
-        error_propagate(errp, local_err);
-        return;
-    }
-
-    while (strings[value] != NULL) {
-        if (strcmp(strings[value], enum_str) == 0) {
-            break;
-        }
-        value++;
-    }
-
-    if (strings[value] == NULL) {
-        error_setg(errp, QERR_INVALID_PARAMETER, enum_str);
-        g_free(enum_str);
-        return;
-    }
-
-    g_free(enum_str);
-    *obj = value;
-}
diff --git a/qemu/qapi/qmp-dispatch.c b/qemu/qapi/qmp-dispatch.c
deleted file mode 100644
index 510a1aead..000000000
--- a/qemu/qapi/qmp-dispatch.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Core Definitions for QAPI/QMP Dispatch
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qapi/qmp/types.h"
-#include "qapi/qmp/dispatch.h"
-#include "qapi/qmp/json-parser.h"
-#include "qapi-types.h"
-#include "qapi/qmp/qerror.h"
-
-static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
-{
-    const QDictEntry *ent;
-    const char *arg_name;
-    const QObject *arg_obj;
-    bool has_exec_key = false;
-    QDict *dict = NULL;
-
-    if (qobject_type(request) != QTYPE_QDICT) {
-        error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT,
-                   "request is not a dictionary");
-        return NULL;
-    }
-
-    dict = qobject_to_qdict(request);
-
-    for (ent = qdict_first(dict); ent;
-         ent = qdict_next(dict, ent)) {
-        arg_name = qdict_entry_key(ent);
-        arg_obj = qdict_entry_value(ent);
-
-        if (!strcmp(arg_name, "execute")) {
-            if (qobject_type(arg_obj) != QTYPE_QSTRING) {
-                error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute",
-                           "string");
-                return NULL;
-            }
-            has_exec_key = true;
-        } else if (strcmp(arg_name, "arguments")) {
-            error_setg(errp, QERR_QMP_EXTRA_MEMBER, arg_name);
-            return NULL;
-        }
-    }
-
-    if (!has_exec_key) {
-        error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT, "execute");
-        return NULL;
-    }
-
-    return dict;
-}
-
-static QObject *do_qmp_dispatch(QObject *request, Error **errp)
-{
-    Error *local_err = NULL;
-    const char *command;
-    QDict *args, *dict;
-    QmpCommand *cmd;
-    QObject *ret = NULL;
-
-    dict = qmp_dispatch_check_obj(request, errp);
-    if (!dict) {
-        return NULL;
-    }
-
-    command = qdict_get_str(dict, "execute");
-    cmd = qmp_find_command(command);
-    if (cmd == NULL) {
-        error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
-                  "The command %s has not been found", command);
-        return NULL;
-    }
-    if (!cmd->enabled) {
-        error_setg(errp, "The command %s has been disabled for this instance",
-                   command);
-        return NULL;
-    }
-
-    if (!qdict_haskey(dict, "arguments")) {
-        args = qdict_new();
-    } else {
-        args = qdict_get_qdict(dict, "arguments");
-        QINCREF(args);
-    }
-
-    switch (cmd->type) {
-    case QCT_NORMAL:
-        cmd->fn(args, &ret, &local_err);
-        if (local_err) {
-            error_propagate(errp, local_err);
-        } else if (cmd->options & QCO_NO_SUCCESS_RESP) {
-            g_assert(!ret);
-        } else if (!ret) {
-            ret = QOBJECT(qdict_new());
-        }
-        break;
-    }
-
-    QDECREF(args);
-
-    return ret;
-}
-
-QObject *qmp_build_error_object(Error *err)
-{
-    return qobject_from_jsonf("{ 'class': %s, 'desc': %s }",
-                              QapiErrorClass_lookup[error_get_class(err)],
-                              error_get_pretty(err));
-}
-
-QObject *qmp_dispatch(QObject *request)
-{
-    Error *err = NULL;
-    QObject *ret;
-    QDict *rsp;
-
-    ret = do_qmp_dispatch(request, &err);
-
-    rsp = qdict_new();
-    if (err) {
-        qdict_put_obj(rsp, "error", qmp_build_error_object(err));
-        error_free(err);
-    } else if (ret) {
-        qdict_put_obj(rsp, "return", ret);
-    } else {
-        QDECREF(rsp);
-        return NULL;
-    }
-
-    return QOBJECT(rsp);
-}
diff --git a/qemu/qapi/qmp-event.c b/qemu/qapi/qmp-event.c
deleted file mode 100644
index 8bba165bf..000000000
--- a/qemu/qapi/qmp-event.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * QMP Event related
- *
- * Copyright (c) 2014 Wenchao Xia
- *
- * Authors:
- *  Wenchao Xia   <wenchaoqemu@gmail.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-
-#include "qemu-common.h"
-#include "qapi/qmp-event.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qjson.h"
-
-static QMPEventFuncEmit qmp_emit;
-
-void qmp_event_set_func_emit(QMPEventFuncEmit emit)
-{
-    qmp_emit = emit;
-}
-
-QMPEventFuncEmit qmp_event_get_func_emit(void)
-{
-    return qmp_emit;
-}
-
-static void timestamp_put(QDict *qdict)
-{
-    int err;
-    QObject *obj;
-    qemu_timeval tv;
-    int64_t sec, usec;
-
-    err = qemu_gettimeofday(&tv);
-    if (err < 0) {
-        /* Put -1 to indicate failure of getting host time */
-        sec = -1;
-        usec = -1;
-    } else {
-        sec = tv.tv_sec;
-        usec = tv.tv_usec;
-    }
-
-    obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", "
-                             "'microseconds': %" PRId64 " }",
-                             sec, usec);
-    qdict_put_obj(qdict, "timestamp", obj);
-}
-
-/*
- * Build a QDict, then fill event name and time stamp, caller should free the
- * QDict after usage.
- */
-QDict *qmp_event_build_dict(const char *event_name)
-{
-    QDict *dict = qdict_new();
-    qdict_put(dict, "event", qstring_from_str(event_name));
-    timestamp_put(dict);
-    return dict;
-}
diff --git a/qemu/qapi/qmp-input-visitor.c b/qemu/qapi/qmp-input-visitor.c
deleted file mode 100644
index 7cd1b777a..000000000
--- a/qemu/qapi/qmp-input-visitor.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Input Visitor
- *
- * Copyright (C) 2012-2016 Red Hat, Inc.
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qapi/qmp-input-visitor.h"
-#include "qapi/visitor-impl.h"
-#include "qemu/queue.h"
-#include "qemu-common.h"
-#include "qapi/qmp/types.h"
-#include "qapi/qmp/qerror.h"
-
-#define QIV_STACK_SIZE 1024
-
-typedef struct StackObject
-{
-    QObject *obj;
-    const QListEntry *entry;
-    GHashTable *h;
-} StackObject;
-
-struct QmpInputVisitor
-{
-    Visitor visitor;
-    StackObject stack[QIV_STACK_SIZE];
-    int nb_stack;
-    bool strict;
-};
-
-static QmpInputVisitor *to_qiv(Visitor *v)
-{
-    return container_of(v, QmpInputVisitor, visitor);
-}
-
-static QObject *qmp_input_get_object(QmpInputVisitor *qiv,
-                                     const char *name,
-                                     bool consume)
-{
-    QObject *qobj = qiv->stack[qiv->nb_stack - 1].obj;
-
-    if (qobj) {
-        if (name && qobject_type(qobj) == QTYPE_QDICT) {
-            if (qiv->stack[qiv->nb_stack - 1].h && consume) {
-                g_hash_table_remove(qiv->stack[qiv->nb_stack - 1].h, name);
-            }
-            return qdict_get(qobject_to_qdict(qobj), name);
-        } else if (qiv->stack[qiv->nb_stack - 1].entry) {
-            return qlist_entry_obj(qiv->stack[qiv->nb_stack - 1].entry);
-        }
-    }
-
-    return qobj;
-}
-
-static void qdict_add_key(const char *key, QObject *obj, void *opaque)
-{
-    GHashTable *h = opaque;
-    g_hash_table_insert(h, (gpointer) key, NULL);
-}
-
-static void qmp_input_push(QmpInputVisitor *qiv, QObject *obj, Error **errp)
-{
-    GHashTable *h;
-
-    if (qiv->nb_stack >= QIV_STACK_SIZE) {
-        error_setg(errp, "An internal buffer overran");
-        return;
-    }
-
-    qiv->stack[qiv->nb_stack].obj = obj;
-    qiv->stack[qiv->nb_stack].entry = NULL;
-    qiv->stack[qiv->nb_stack].h = NULL;
-
-    if (qiv->strict && qobject_type(obj) == QTYPE_QDICT) {
-        h = g_hash_table_new(g_str_hash, g_str_equal);
-        qdict_iter(qobject_to_qdict(obj), qdict_add_key, h);
-        qiv->stack[qiv->nb_stack].h = h;
-    }
-
-    qiv->nb_stack++;
-}
-
-
-static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp)
-{
-    assert(qiv->nb_stack > 0);
-
-    if (qiv->strict) {
-        GHashTable * const top_ht = qiv->stack[qiv->nb_stack - 1].h;
-        if (top_ht) {
-            GHashTableIter iter;
-            const char *key;
-
-            g_hash_table_iter_init(&iter, top_ht);
-            if (g_hash_table_iter_next(&iter, (void **)&key, NULL)) {
-                error_setg(errp, QERR_QMP_EXTRA_MEMBER, key);
-            }
-            g_hash_table_unref(top_ht);
-        }
-    }
-
-    qiv->nb_stack--;
-}
-
-static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
-                                   size_t size, Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QObject *qobj = qmp_input_get_object(qiv, name, true);
-    Error *err = NULL;
-
-    if (!qobj || qobject_type(qobj) != QTYPE_QDICT) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "QDict");
-        return;
-    }
-
-    qmp_input_push(qiv, qobj, &err);
-    if (err) {
-        error_propagate(errp, err);
-        return;
-    }
-
-    if (obj) {
-        *obj = g_malloc0(size);
-    }
-}
-
-static void qmp_input_end_struct(Visitor *v, Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-
-    qmp_input_pop(qiv, errp);
-}
-
-static void qmp_input_start_list(Visitor *v, const char *name, Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QObject *qobj = qmp_input_get_object(qiv, name, true);
-
-    if (!qobj || qobject_type(qobj) != QTYPE_QLIST) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "list");
-        return;
-    }
-
-    qmp_input_push(qiv, qobj, errp);
-}
-
-static GenericList *qmp_input_next_list(Visitor *v, GenericList **list,
-                                        size_t size)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    GenericList *entry;
-    StackObject *so = &qiv->stack[qiv->nb_stack - 1];
-    bool first;
-
-    if (so->entry == NULL) {
-        so->entry = qlist_first(qobject_to_qlist(so->obj));
-        first = true;
-    } else {
-        so->entry = qlist_next(so->entry);
-        first = false;
-    }
-
-    if (so->entry == NULL) {
-        return NULL;
-    }
-
-    entry = g_malloc0(size);
-    if (first) {
-        *list = entry;
-    } else {
-        (*list)->next = entry;
-    }
-
-    return entry;
-}
-
-static void qmp_input_end_list(Visitor *v)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-
-    qmp_input_pop(qiv, &error_abort);
-}
-
-static void qmp_input_start_alternate(Visitor *v, const char *name,
-                                      GenericAlternate **obj, size_t size,
-                                      bool promote_int, Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QObject *qobj = qmp_input_get_object(qiv, name, false);
-
-    if (!qobj) {
-        *obj = NULL;
-        error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
-        return;
-    }
-    *obj = g_malloc0(size);
-    (*obj)->type = qobject_type(qobj);
-    if (promote_int && (*obj)->type == QTYPE_QINT) {
-        (*obj)->type = QTYPE_QFLOAT;
-    }
-}
-
-static void qmp_input_type_int64(Visitor *v, const char *name, int64_t *obj,
-                                 Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
-
-    if (!qint) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "integer");
-        return;
-    }
-
-    *obj = qint_get_int(qint);
-}
-
-static void qmp_input_type_uint64(Visitor *v, const char *name, uint64_t *obj,
-                                  Error **errp)
-{
-    /* FIXME: qobject_to_qint mishandles values over INT64_MAX */
-    QmpInputVisitor *qiv = to_qiv(v);
-    QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
-
-    if (!qint) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "integer");
-        return;
-    }
-
-    *obj = qint_get_int(qint);
-}
-
-static void qmp_input_type_bool(Visitor *v, const char *name, bool *obj,
-                                Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QBool *qbool = qobject_to_qbool(qmp_input_get_object(qiv, name, true));
-
-    if (!qbool) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "boolean");
-        return;
-    }
-
-    *obj = qbool_get_bool(qbool);
-}
-
-static void qmp_input_type_str(Visitor *v, const char *name, char **obj,
-                               Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QString *qstr = qobject_to_qstring(qmp_input_get_object(qiv, name, true));
-
-    if (!qstr) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "string");
-        return;
-    }
-
-    *obj = g_strdup(qstring_get_str(qstr));
-}
-
-static void qmp_input_type_number(Visitor *v, const char *name, double *obj,
-                                  Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QObject *qobj = qmp_input_get_object(qiv, name, true);
-    QInt *qint;
-    QFloat *qfloat;
-
-    qint = qobject_to_qint(qobj);
-    if (qint) {
-        *obj = qint_get_int(qobject_to_qint(qobj));
-        return;
-    }
-
-    qfloat = qobject_to_qfloat(qobj);
-    if (qfloat) {
-        *obj = qfloat_get_double(qobject_to_qfloat(qobj));
-        return;
-    }
-
-    error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-               "number");
-}
-
-static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj,
-                               Error **errp)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QObject *qobj = qmp_input_get_object(qiv, name, true);
-
-    qobject_incref(qobj);
-    *obj = qobj;
-}
-
-static void qmp_input_optional(Visitor *v, const char *name, bool *present)
-{
-    QmpInputVisitor *qiv = to_qiv(v);
-    QObject *qobj = qmp_input_get_object(qiv, name, true);
-
-    if (!qobj) {
-        *present = false;
-        return;
-    }
-
-    *present = true;
-}
-
-Visitor *qmp_input_get_visitor(QmpInputVisitor *v)
-{
-    return &v->visitor;
-}
-
-void qmp_input_visitor_cleanup(QmpInputVisitor *v)
-{
-    qobject_decref(v->stack[0].obj);
-    g_free(v);
-}
-
-QmpInputVisitor *qmp_input_visitor_new(QObject *obj)
-{
-    QmpInputVisitor *v;
-
-    v = g_malloc0(sizeof(*v));
-
-    v->visitor.start_struct = qmp_input_start_struct;
-    v->visitor.end_struct = qmp_input_end_struct;
-    v->visitor.start_list = qmp_input_start_list;
-    v->visitor.next_list = qmp_input_next_list;
-    v->visitor.end_list = qmp_input_end_list;
-    v->visitor.start_alternate = qmp_input_start_alternate;
-    v->visitor.type_enum = input_type_enum;
-    v->visitor.type_int64 = qmp_input_type_int64;
-    v->visitor.type_uint64 = qmp_input_type_uint64;
-    v->visitor.type_bool = qmp_input_type_bool;
-    v->visitor.type_str = qmp_input_type_str;
-    v->visitor.type_number = qmp_input_type_number;
-    v->visitor.type_any = qmp_input_type_any;
-    v->visitor.optional = qmp_input_optional;
-
-    qmp_input_push(v, obj, NULL);
-    qobject_incref(obj);
-
-    return v;
-}
-
-QmpInputVisitor *qmp_input_visitor_new_strict(QObject *obj)
-{
-    QmpInputVisitor *v;
-
-    v = qmp_input_visitor_new(obj);
-    v->strict = true;
-
-    return v;
-}
diff --git a/qemu/qapi/qmp-output-visitor.c b/qemu/qapi/qmp-output-visitor.c
deleted file mode 100644
index d44c67631..000000000
--- a/qemu/qapi/qmp-output-visitor.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Core Definitions for QAPI/QMP Command Registry
- *
- * Copyright (C) 2012-2016 Red Hat, Inc.
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qapi/qmp-output-visitor.h"
-#include "qapi/visitor-impl.h"
-#include "qemu/queue.h"
-#include "qemu-common.h"
-#include "qapi/qmp/types.h"
-
-typedef struct QStackEntry
-{
-    QObject *value;
-    bool is_list_head;
-    QTAILQ_ENTRY(QStackEntry) node;
-} QStackEntry;
-
-typedef QTAILQ_HEAD(QStack, QStackEntry) QStack;
-
-struct QmpOutputVisitor
-{
-    Visitor visitor;
-    QStack stack; /* Stack of containers that haven't yet been finished */
-    QObject *root; /* Root of the output visit */
-};
-
-#define qmp_output_add(qov, name, value) \
-    qmp_output_add_obj(qov, name, QOBJECT(value))
-#define qmp_output_push(qov, value) qmp_output_push_obj(qov, QOBJECT(value))
-
-static QmpOutputVisitor *to_qov(Visitor *v)
-{
-    return container_of(v, QmpOutputVisitor, visitor);
-}
-
-/* Push @value onto the stack of current QObjects being built */
-static void qmp_output_push_obj(QmpOutputVisitor *qov, QObject *value)
-{
-    QStackEntry *e = g_malloc0(sizeof(*e));
-
-    assert(qov->root);
-    assert(value);
-    e->value = value;
-    if (qobject_type(e->value) == QTYPE_QLIST) {
-        e->is_list_head = true;
-    }
-    QTAILQ_INSERT_HEAD(&qov->stack, e, node);
-}
-
-/* Pop a value off the stack of QObjects being built, and return it. */
-static QObject *qmp_output_pop(QmpOutputVisitor *qov)
-{
-    QStackEntry *e = QTAILQ_FIRST(&qov->stack);
-    QObject *value;
-
-    assert(e);
-    QTAILQ_REMOVE(&qov->stack, e, node);
-    value = e->value;
-    assert(value);
-    g_free(e);
-    return value;
-}
-
-/* Add @value to the current QObject being built.
- * If the stack is visiting a dictionary or list, @value is now owned
- * by that container. Otherwise, @value is now the root.  */
-static void qmp_output_add_obj(QmpOutputVisitor *qov, const char *name,
-                               QObject *value)
-{
-    QStackEntry *e = QTAILQ_FIRST(&qov->stack);
-    QObject *cur = e ? e->value : NULL;
-
-    if (!cur) {
-        /* FIXME we should require the user to reset the visitor, rather
-         * than throwing away the previous root */
-        qobject_decref(qov->root);
-        qov->root = value;
-    } else {
-        switch (qobject_type(cur)) {
-        case QTYPE_QDICT:
-            assert(name);
-            qdict_put_obj(qobject_to_qdict(cur), name, value);
-            break;
-        case QTYPE_QLIST:
-            qlist_append_obj(qobject_to_qlist(cur), value);
-            break;
-        default:
-            g_assert_not_reached();
-        }
-    }
-}
-
-static void qmp_output_start_struct(Visitor *v, const char *name, void **obj,
-                                    size_t unused, Error **errp)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    QDict *dict = qdict_new();
-
-    qmp_output_add(qov, name, dict);
-    qmp_output_push(qov, dict);
-}
-
-static void qmp_output_end_struct(Visitor *v, Error **errp)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    qmp_output_pop(qov);
-}
-
-static void qmp_output_start_list(Visitor *v, const char *name, Error **errp)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    QList *list = qlist_new();
-
-    qmp_output_add(qov, name, list);
-    qmp_output_push(qov, list);
-}
-
-static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp,
-                                         size_t size)
-{
-    GenericList *list = *listp;
-    QmpOutputVisitor *qov = to_qov(v);
-    QStackEntry *e = QTAILQ_FIRST(&qov->stack);
-
-    assert(e);
-    if (e->is_list_head) {
-        e->is_list_head = false;
-        return list;
-    }
-
-    return list ? list->next : NULL;
-}
-
-static void qmp_output_end_list(Visitor *v)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    qmp_output_pop(qov);
-}
-
-static void qmp_output_type_int64(Visitor *v, const char *name, int64_t *obj,
-                                  Error **errp)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    qmp_output_add(qov, name, qint_from_int(*obj));
-}
-
-static void qmp_output_type_uint64(Visitor *v, const char *name, uint64_t *obj,
-                                   Error **errp)
-{
-    /* FIXME: QMP outputs values larger than INT64_MAX as negative */
-    QmpOutputVisitor *qov = to_qov(v);
-    qmp_output_add(qov, name, qint_from_int(*obj));
-}
-
-static void qmp_output_type_bool(Visitor *v, const char *name, bool *obj,
-                                 Error **errp)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    qmp_output_add(qov, name, qbool_from_bool(*obj));
-}
-
-static void qmp_output_type_str(Visitor *v, const char *name, char **obj,
-                                Error **errp)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    if (*obj) {
-        qmp_output_add(qov, name, qstring_from_str(*obj));
-    } else {
-        qmp_output_add(qov, name, qstring_from_str(""));
-    }
-}
-
-static void qmp_output_type_number(Visitor *v, const char *name, double *obj,
-                                   Error **errp)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    qmp_output_add(qov, name, qfloat_from_double(*obj));
-}
-
-static void qmp_output_type_any(Visitor *v, const char *name, QObject **obj,
-                                Error **errp)
-{
-    QmpOutputVisitor *qov = to_qov(v);
-    qobject_incref(*obj);
-    qmp_output_add_obj(qov, name, *obj);
-}
-
-/* Finish building, and return the root object. Will not be NULL. */
-QObject *qmp_output_get_qobject(QmpOutputVisitor *qov)
-{
-    /* FIXME: we should require that a visit occurred, and that it is
-     * complete (no starts without a matching end) */
-    QObject *obj = qov->root;
-    if (obj) {
-        qobject_incref(obj);
-    } else {
-        obj = qnull();
-    }
-    return obj;
-}
-
-Visitor *qmp_output_get_visitor(QmpOutputVisitor *v)
-{
-    return &v->visitor;
-}
-
-void qmp_output_visitor_cleanup(QmpOutputVisitor *v)
-{
-    QStackEntry *e, *tmp;
-
-    QTAILQ_FOREACH_SAFE(e, &v->stack, node, tmp) {
-        QTAILQ_REMOVE(&v->stack, e, node);
-        g_free(e);
-    }
-
-    qobject_decref(v->root);
-    g_free(v);
-}
-
-QmpOutputVisitor *qmp_output_visitor_new(void)
-{
-    QmpOutputVisitor *v;
-
-    v = g_malloc0(sizeof(*v));
-
-    v->visitor.start_struct = qmp_output_start_struct;
-    v->visitor.end_struct = qmp_output_end_struct;
-    v->visitor.start_list = qmp_output_start_list;
-    v->visitor.next_list = qmp_output_next_list;
-    v->visitor.end_list = qmp_output_end_list;
-    v->visitor.type_enum = output_type_enum;
-    v->visitor.type_int64 = qmp_output_type_int64;
-    v->visitor.type_uint64 = qmp_output_type_uint64;
-    v->visitor.type_bool = qmp_output_type_bool;
-    v->visitor.type_str = qmp_output_type_str;
-    v->visitor.type_number = qmp_output_type_number;
-    v->visitor.type_any = qmp_output_type_any;
-
-    QTAILQ_INIT(&v->stack);
-
-    return v;
-}
diff --git a/qemu/qapi/qmp-registry.c b/qemu/qapi/qmp-registry.c
deleted file mode 100644
index 4ebfbccd4..000000000
--- a/qemu/qapi/qmp-registry.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Core Definitions for QAPI/QMP Dispatch
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *  Michael Roth      <mdroth@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include <glib.h>
-#include "qapi/qmp/dispatch.h"
-
-static QTAILQ_HEAD(QmpCommandList, QmpCommand) qmp_commands =
-    QTAILQ_HEAD_INITIALIZER(qmp_commands);
-
-void qmp_register_command(const char *name, QmpCommandFunc *fn,
-                          QmpCommandOptions options)
-{
-    QmpCommand *cmd = g_malloc0(sizeof(*cmd));
-
-    cmd->name = name;
-    cmd->type = QCT_NORMAL;
-    cmd->fn = fn;
-    cmd->enabled = true;
-    cmd->options = options;
-    QTAILQ_INSERT_TAIL(&qmp_commands, cmd, node);
-}
-
-QmpCommand *qmp_find_command(const char *name)
-{
-    QmpCommand *cmd;
-
-    QTAILQ_FOREACH(cmd, &qmp_commands, node) {
-        if (strcmp(cmd->name, name) == 0) {
-            return cmd;
-        }
-    }
-    return NULL;
-}
-
-static void qmp_toggle_command(const char *name, bool enabled)
-{
-    QmpCommand *cmd;
-
-    QTAILQ_FOREACH(cmd, &qmp_commands, node) {
-        if (strcmp(cmd->name, name) == 0) {
-            cmd->enabled = enabled;
-            return;
-        }
-    }
-}
-
-void qmp_disable_command(const char *name)
-{
-    qmp_toggle_command(name, false);
-}
-
-void qmp_enable_command(const char *name)
-{
-    qmp_toggle_command(name, true);
-}
-
-bool qmp_command_is_enabled(const QmpCommand *cmd)
-{
-    return cmd->enabled;
-}
-
-const char *qmp_command_name(const QmpCommand *cmd)
-{
-    return cmd->name;
-}
-
-bool qmp_has_success_response(const QmpCommand *cmd)
-{
-    return !(cmd->options & QCO_NO_SUCCESS_RESP);
-}
-
-void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque)
-{
-    QmpCommand *cmd;
-
-    QTAILQ_FOREACH(cmd, &qmp_commands, node) {
-        fn(cmd, opaque);
-    }
-}
diff --git a/qemu/qapi/rocker.json b/qemu/qapi/rocker.json
deleted file mode 100644
index 2fe7fdfa6..000000000
--- a/qemu/qapi/rocker.json
+++ /dev/null
@@ -1,286 +0,0 @@
-##
-# @Rocker:
-#
-# Rocker switch information.
-#
-# @name: switch name
-#
-# @id: switch ID
-#
-# @ports: number of front-panel ports
-#
-# Since: 2.4
-##
-{ 'struct': 'RockerSwitch',
-  'data': { 'name': 'str', 'id': 'uint64', 'ports': 'uint32' } }
-
-##
-# @query-rocker:
-#
-# Return rocker switch information.
-#
-# Returns: @Rocker information
-#
-# Since: 2.4
-##
-{ 'command': 'query-rocker',
-  'data': { 'name': 'str' },
-  'returns': 'RockerSwitch' }
-
-##
-# @RockerPortDuplex:
-#
-# An eumeration of port duplex states.
-#
-# @half: half duplex
-#
-# @full: full duplex
-#
-# Since: 2.4
-##
-{ 'enum': 'RockerPortDuplex', 'data': [ 'half', 'full' ] }
-
-##
-# @RockerPortAutoneg:
-#
-# An eumeration of port autoneg states.
-#
-# @off: autoneg is off
-#
-# @on: autoneg is on
-#
-# Since: 2.4
-##
-{ 'enum': 'RockerPortAutoneg', 'data': [ 'off', 'on' ] }
-
-##
-# @RockerPort:
-#
-# Rocker switch port information.
-#
-# @name: port name
-#
-# @enabled: port is enabled for I/O
-#
-# @link-up: physical link is UP on port
-#
-# @speed: port link speed in Mbps
-#
-# @duplex: port link duplex
-#
-# @autoneg: port link autoneg
-#
-# Since: 2.4
-##
-{ 'struct': 'RockerPort',
-  'data': { 'name': 'str', 'enabled': 'bool', 'link-up': 'bool',
-            'speed': 'uint32', 'duplex': 'RockerPortDuplex',
-            'autoneg': 'RockerPortAutoneg' } }
-
-##
-# @query-rocker-ports:
-#
-# Return rocker switch information.
-#
-# Returns: @Rocker information
-#
-# Since: 2.4
-##
-{ 'command': 'query-rocker-ports',
-  'data': { 'name': 'str' },
-  'returns': ['RockerPort'] }
-
-##
-# @RockerOfDpaFlowKey:
-#
-# Rocker switch OF-DPA flow key
-#
-# @priority: key priority, 0 being lowest priority
-#
-# @tbl-id: flow table ID
-#
-# @in-pport: #optional physical input port
-#
-# @tunnel-id: #optional tunnel ID
-#
-# @vlan-id: #optional VLAN ID
-#
-# @eth-type: #optional Ethernet header type
-#
-# @eth-src: #optional Ethernet header source MAC address
-#
-# @eth-dst: #optional Ethernet header destination MAC address
-#
-# @ip-proto: #optional IP Header protocol field
-#
-# @ip-tos: #optional IP header TOS field
-#
-# @ip-dst: #optional IP header destination address
-#
-# Note: fields are marked #optional to indicate that they may or may not
-# appear in the flow key depending if they're relevant to the flow key.
-#
-# Since: 2.4
-##
-{ 'struct': 'RockerOfDpaFlowKey',
-  'data' : { 'priority': 'uint32', 'tbl-id': 'uint32', '*in-pport': 'uint32',
-             '*tunnel-id': 'uint32', '*vlan-id': 'uint16',
-             '*eth-type': 'uint16', '*eth-src': 'str', '*eth-dst': 'str',
-             '*ip-proto': 'uint8', '*ip-tos': 'uint8', '*ip-dst': 'str' } }
-
-##
-# @RockerOfDpaFlowMask:
-#
-# Rocker switch OF-DPA flow mask
-#
-# @in-pport: #optional physical input port
-#
-# @tunnel-id: #optional tunnel ID
-#
-# @vlan-id: #optional VLAN ID
-#
-# @eth-src: #optional Ethernet header source MAC address
-#
-# @eth-dst: #optional Ethernet header destination MAC address
-#
-# @ip-proto: #optional IP Header protocol field
-#
-# @ip-tos: #optional IP header TOS field
-#
-# Note: fields are marked #optional to indicate that they may or may not
-# appear in the flow mask depending if they're relevant to the flow mask.
-#
-# Since: 2.4
-##
-{ 'struct': 'RockerOfDpaFlowMask',
-  'data' : { '*in-pport': 'uint32', '*tunnel-id': 'uint32',
-             '*vlan-id': 'uint16', '*eth-src': 'str', '*eth-dst': 'str',
-             '*ip-proto': 'uint8', '*ip-tos': 'uint8' } }
-
-##
-# @RockerOfDpaFlowAction:
-#
-# Rocker switch OF-DPA flow action
-#
-# @goto-tbl: #optional next table ID
-#
-# @group-id: #optional group ID
-#
-# @tunnel-lport: #optional tunnel logical port ID
-#
-# @vlan-id: #optional VLAN ID
-#
-# @new-vlan-id: #optional new VLAN ID
-#
-# @out-pport: #optional physical output port
-#
-# Note: fields are marked #optional to indicate that they may or may not
-# appear in the flow action depending if they're relevant to the flow action.
-#
-# Since: 2.4
-##
-{ 'struct': 'RockerOfDpaFlowAction',
-  'data' : { '*goto-tbl': 'uint32', '*group-id': 'uint32',
-             '*tunnel-lport': 'uint32', '*vlan-id': 'uint16',
-             '*new-vlan-id': 'uint16', '*out-pport': 'uint32' } }
-
-##
-# @RockerOfDpaFlow:
-#
-# Rocker switch OF-DPA flow
-#
-# @cookie: flow unique cookie ID
-#
-# @hits: count of matches (hits) on flow
-#
-# @key: flow key
-#
-# @mask: flow mask
-#
-# @action: flow action
-#
-# Since: 2.4
-##
-{ 'struct': 'RockerOfDpaFlow',
-  'data': { 'cookie': 'uint64', 'hits': 'uint64', 'key': 'RockerOfDpaFlowKey',
-            'mask': 'RockerOfDpaFlowMask', 'action': 'RockerOfDpaFlowAction' } }
-
-##
-# @query-rocker-of-dpa-flows:
-#
-# Return rocker OF-DPA flow information.
-#
-# @name: switch name
-#
-# @tbl-id: #optional flow table ID.  If tbl-id is not specified, returns
-# flow information for all tables.
-#
-# Returns: @Rocker OF-DPA flow information
-#
-# Since: 2.4
-##
-{ 'command': 'query-rocker-of-dpa-flows',
-  'data': { 'name': 'str', '*tbl-id': 'uint32' },
-  'returns': ['RockerOfDpaFlow'] }
-
-##
-# @RockerOfDpaGroup:
-#
-# Rocker switch OF-DPA group
-#
-# @id: group unique ID
-#
-# @type: group type
-#
-# @vlan-id: #optional VLAN ID
-#
-# @pport: #optional physical port number
-#
-# @index: #optional group index, unique with group type
-#
-# @out-pport: #optional output physical port number
-#
-# @group-id: #optional next group ID
-#
-# @set-vlan-id: #optional VLAN ID to set
-#
-# @pop-vlan: #optional pop VLAN headr from packet
-#
-# @group-ids: #optional list of next group IDs
-#
-# @set-eth-src: #optional set source MAC address in Ethernet header
-#
-# @set-eth-dst: #optional set destination MAC address in Ethernet header
-#
-# @ttl-check: #optional perform TTL check
-#
-# Note: fields are marked #optional to indicate that they may or may not
-# appear in the group depending if they're relevant to the group type.
-#
-# Since: 2.4
-##
-{ 'struct': 'RockerOfDpaGroup',
-  'data': { 'id': 'uint32',  'type': 'uint8', '*vlan-id': 'uint16',
-            '*pport': 'uint32', '*index': 'uint32', '*out-pport': 'uint32',
-            '*group-id': 'uint32', '*set-vlan-id': 'uint16',
-            '*pop-vlan': 'uint8', '*group-ids': ['uint32'],
-            '*set-eth-src': 'str', '*set-eth-dst': 'str',
-            '*ttl-check': 'uint8' } }
-
-##
-# @query-rocker-of-dpa-groups:
-#
-# Return rocker OF-DPA group information.
-#
-# @name: switch name
-#
-# @type: #optional group type.  If type is not specified, returns
-# group information for all group types.
-#
-# Returns: @Rocker OF-DPA group information
-#
-# Since: 2.4
-##
-{ 'command': 'query-rocker-of-dpa-groups',
-  'data': { 'name': 'str', '*type': 'uint8' },
-  'returns': ['RockerOfDpaGroup'] }
diff --git a/qemu/qapi/string-input-visitor.c b/qemu/qapi/string-input-visitor.c
deleted file mode 100644
index 5ea2d77b5..000000000
--- a/qemu/qapi/string-input-visitor.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * String parsing visitor
- *
- * Copyright Red Hat, Inc. 2012-2016
- *
- * Author: Paolo Bonzini <pbonzini@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qemu-common.h"
-#include "qapi/string-input-visitor.h"
-#include "qapi/visitor-impl.h"
-#include "qapi/qmp/qerror.h"
-#include "qemu/option.h"
-#include "qemu/queue.h"
-#include "qemu/range.h"
-
-
-struct StringInputVisitor
-{
-    Visitor visitor;
-
-    bool head;
-
-    GList *ranges;
-    GList *cur_range;
-    int64_t cur;
-
-    const char *string;
-};
-
-static StringInputVisitor *to_siv(Visitor *v)
-{
-    return container_of(v, StringInputVisitor, visitor);
-}
-
-static void free_range(void *range, void *dummy)
-{
-    g_free(range);
-}
-
-static void parse_str(StringInputVisitor *siv, Error **errp)
-{
-    char *str = (char *) siv->string;
-    long long start, end;
-    Range *cur;
-    char *endptr;
-
-    if (siv->ranges) {
-        return;
-    }
-
-    do {
-        errno = 0;
-        start = strtoll(str, &endptr, 0);
-        if (errno == 0 && endptr > str) {
-            if (*endptr == '\0') {
-                cur = g_malloc0(sizeof(*cur));
-                cur->begin = start;
-                cur->end = start + 1;
-                siv->ranges = g_list_insert_sorted_merged(siv->ranges, cur,
-                                                          range_compare);
-                cur = NULL;
-                str = NULL;
-            } else if (*endptr == '-') {
-                str = endptr + 1;
-                errno = 0;
-                end = strtoll(str, &endptr, 0);
-                if (errno == 0 && endptr > str && start <= end &&
-                    (start > INT64_MAX - 65536 ||
-                     end < start + 65536)) {
-                    if (*endptr == '\0') {
-                        cur = g_malloc0(sizeof(*cur));
-                        cur->begin = start;
-                        cur->end = end + 1;
-                        siv->ranges =
-                            g_list_insert_sorted_merged(siv->ranges,
-                                                        cur,
-                                                        range_compare);
-                        cur = NULL;
-                        str = NULL;
-                    } else if (*endptr == ',') {
-                        str = endptr + 1;
-                        cur = g_malloc0(sizeof(*cur));
-                        cur->begin = start;
-                        cur->end = end + 1;
-                        siv->ranges =
-                            g_list_insert_sorted_merged(siv->ranges,
-                                                        cur,
-                                                        range_compare);
-                        cur = NULL;
-                    } else {
-                        goto error;
-                    }
-                } else {
-                    goto error;
-                }
-            } else if (*endptr == ',') {
-                str = endptr + 1;
-                cur = g_malloc0(sizeof(*cur));
-                cur->begin = start;
-                cur->end = start + 1;
-                siv->ranges = g_list_insert_sorted_merged(siv->ranges,
-                                                          cur,
-                                                          range_compare);
-                cur = NULL;
-            } else {
-                goto error;
-            }
-        } else {
-            goto error;
-        }
-    } while (str);
-
-    return;
-error:
-    g_list_foreach(siv->ranges, free_range, NULL);
-    g_list_free(siv->ranges);
-    siv->ranges = NULL;
-}
-
-static void
-start_list(Visitor *v, const char *name, Error **errp)
-{
-    StringInputVisitor *siv = to_siv(v);
-
-    parse_str(siv, errp);
-
-    siv->cur_range = g_list_first(siv->ranges);
-    if (siv->cur_range) {
-        Range *r = siv->cur_range->data;
-        if (r) {
-            siv->cur = r->begin;
-        }
-    }
-}
-
-static GenericList *next_list(Visitor *v, GenericList **list, size_t size)
-{
-    StringInputVisitor *siv = to_siv(v);
-    GenericList **link;
-    Range *r;
-
-    if (!siv->ranges || !siv->cur_range) {
-        return NULL;
-    }
-
-    r = siv->cur_range->data;
-    if (!r) {
-        return NULL;
-    }
-
-    if (siv->cur < r->begin || siv->cur >= r->end) {
-        siv->cur_range = g_list_next(siv->cur_range);
-        if (!siv->cur_range) {
-            return NULL;
-        }
-        r = siv->cur_range->data;
-        if (!r) {
-            return NULL;
-        }
-        siv->cur = r->begin;
-    }
-
-    if (siv->head) {
-        link = list;
-        siv->head = false;
-    } else {
-        link = &(*list)->next;
-    }
-
-    *link = g_malloc0(size);
-    return *link;
-}
-
-static void end_list(Visitor *v)
-{
-    StringInputVisitor *siv = to_siv(v);
-    siv->head = true;
-}
-
-static void parse_type_int64(Visitor *v, const char *name, int64_t *obj,
-                             Error **errp)
-{
-    StringInputVisitor *siv = to_siv(v);
-
-    if (!siv->string) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "integer");
-        return;
-    }
-
-    parse_str(siv, errp);
-
-    if (!siv->ranges) {
-        goto error;
-    }
-
-    if (!siv->cur_range) {
-        Range *r;
-
-        siv->cur_range = g_list_first(siv->ranges);
-        if (!siv->cur_range) {
-            goto error;
-        }
-
-        r = siv->cur_range->data;
-        if (!r) {
-            goto error;
-        }
-
-        siv->cur = r->begin;
-    }
-
-    *obj = siv->cur;
-    siv->cur++;
-    return;
-
-error:
-    error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null",
-               "an int64 value or range");
-}
-
-static void parse_type_uint64(Visitor *v, const char *name, uint64_t *obj,
-                              Error **errp)
-{
-    /* FIXME: parse_type_int64 mishandles values over INT64_MAX */
-    int64_t i;
-    Error *err = NULL;
-    parse_type_int64(v, name, &i, &err);
-    if (err) {
-        error_propagate(errp, err);
-    } else {
-        *obj = i;
-    }
-}
-
-static void parse_type_size(Visitor *v, const char *name, uint64_t *obj,
-                            Error **errp)
-{
-    StringInputVisitor *siv = to_siv(v);
-    Error *err = NULL;
-    uint64_t val;
-
-    if (siv->string) {
-        parse_option_size(name, siv->string, &val, &err);
-    } else {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "size");
-        return;
-    }
-    if (err) {
-        error_propagate(errp, err);
-        return;
-    }
-
-    *obj = val;
-}
-
-static void parse_type_bool(Visitor *v, const char *name, bool *obj,
-                            Error **errp)
-{
-    StringInputVisitor *siv = to_siv(v);
-
-    if (siv->string) {
-        if (!strcasecmp(siv->string, "on") ||
-            !strcasecmp(siv->string, "yes") ||
-            !strcasecmp(siv->string, "true")) {
-            *obj = true;
-            return;
-        }
-        if (!strcasecmp(siv->string, "off") ||
-            !strcasecmp(siv->string, "no") ||
-            !strcasecmp(siv->string, "false")) {
-            *obj = false;
-            return;
-        }
-    }
-
-    error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-               "boolean");
-}
-
-static void parse_type_str(Visitor *v, const char *name, char **obj,
-                           Error **errp)
-{
-    StringInputVisitor *siv = to_siv(v);
-    if (siv->string) {
-        *obj = g_strdup(siv->string);
-    } else {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "string");
-    }
-}
-
-static void parse_type_number(Visitor *v, const char *name, double *obj,
-                              Error **errp)
-{
-    StringInputVisitor *siv = to_siv(v);
-    char *endp = (char *) siv->string;
-    double val;
-
-    errno = 0;
-    if (siv->string) {
-        val = strtod(siv->string, &endp);
-    }
-    if (!siv->string || errno || endp == siv->string || *endp) {
-        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-                   "number");
-        return;
-    }
-
-    *obj = val;
-}
-
-static void parse_optional(Visitor *v, const char *name, bool *present)
-{
-    StringInputVisitor *siv = to_siv(v);
-
-    if (!siv->string) {
-        *present = false;
-        return;
-    }
-
-    *present = true;
-}
-
-Visitor *string_input_get_visitor(StringInputVisitor *v)
-{
-    return &v->visitor;
-}
-
-void string_input_visitor_cleanup(StringInputVisitor *v)
-{
-    g_list_foreach(v->ranges, free_range, NULL);
-    g_list_free(v->ranges);
-    g_free(v);
-}
-
-StringInputVisitor *string_input_visitor_new(const char *str)
-{
-    StringInputVisitor *v;
-
-    v = g_malloc0(sizeof(*v));
-
-    v->visitor.type_enum = input_type_enum;
-    v->visitor.type_int64 = parse_type_int64;
-    v->visitor.type_uint64 = parse_type_uint64;
-    v->visitor.type_size = parse_type_size;
-    v->visitor.type_bool = parse_type_bool;
-    v->visitor.type_str = parse_type_str;
-    v->visitor.type_number = parse_type_number;
-    v->visitor.start_list = start_list;
-    v->visitor.next_list = next_list;
-    v->visitor.end_list = end_list;
-    v->visitor.optional = parse_optional;
-
-    v->string = str;
-    v->head = true;
-    return v;
-}
diff --git a/qemu/qapi/string-output-visitor.c b/qemu/qapi/string-output-visitor.c
deleted file mode 100644
index c2e5c5b92..000000000
--- a/qemu/qapi/string-output-visitor.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * String printing Visitor
- *
- * Copyright Red Hat, Inc. 2012-2016
- *
- * Author: Paolo Bonzini <pbonzini@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qapi/string-output-visitor.h"
-#include "qapi/visitor-impl.h"
-#include "qemu/host-utils.h"
-#include <math.h>
-#include "qemu/range.h"
-
-enum ListMode {
-    LM_NONE,             /* not traversing a list of repeated options */
-    LM_STARTED,          /* start_list() succeeded */
-
-    LM_IN_PROGRESS,      /* next_list() has been called.
-                          *
-                          * Generating the next list link will consume the most
-                          * recently parsed QemuOpt instance of the repeated
-                          * option.
-                          *
-                          * Parsing a value into the list link will examine the
-                          * next QemuOpt instance of the repeated option, and
-                          * possibly enter LM_SIGNED_INTERVAL or
-                          * LM_UNSIGNED_INTERVAL.
-                          */
-
-    LM_SIGNED_INTERVAL,  /* next_list() has been called.
-                          *
-                          * Generating the next list link will consume the most
-                          * recently stored element from the signed interval,
-                          * parsed from the most recent QemuOpt instance of the
-                          * repeated option. This may consume QemuOpt itself
-                          * and return to LM_IN_PROGRESS.
-                          *
-                          * Parsing a value into the list link will store the
-                          * next element of the signed interval.
-                          */
-
-    LM_UNSIGNED_INTERVAL,/* Same as above, only for an unsigned interval. */
-
-    LM_END
-};
-
-typedef enum ListMode ListMode;
-
-struct StringOutputVisitor
-{
-    Visitor visitor;
-    bool human;
-    GString *string;
-    bool head;
-    ListMode list_mode;
-    union {
-        int64_t s;
-        uint64_t u;
-    } range_start, range_end;
-    GList *ranges;
-};
-
-static StringOutputVisitor *to_sov(Visitor *v)
-{
-    return container_of(v, StringOutputVisitor, visitor);
-}
-
-static void string_output_set(StringOutputVisitor *sov, char *string)
-{
-    if (sov->string) {
-        g_string_free(sov->string, true);
-    }
-    sov->string = g_string_new(string);
-    g_free(string);
-}
-
-static void string_output_append(StringOutputVisitor *sov, int64_t a)
-{
-    Range *r = g_malloc0(sizeof(*r));
-    r->begin = a;
-    r->end = a + 1;
-    sov->ranges = g_list_insert_sorted_merged(sov->ranges, r, range_compare);
-}
-
-static void string_output_append_range(StringOutputVisitor *sov,
-                                       int64_t s, int64_t e)
-{
-    Range *r = g_malloc0(sizeof(*r));
-    r->begin = s;
-    r->end = e + 1;
-    sov->ranges = g_list_insert_sorted_merged(sov->ranges, r, range_compare);
-}
-
-static void format_string(StringOutputVisitor *sov, Range *r, bool next,
-                          bool human)
-{
-    if (r->end - r->begin > 1) {
-        if (human) {
-            g_string_append_printf(sov->string, "0x%" PRIx64 "-0x%" PRIx64,
-                                   r->begin, r->end - 1);
-
-        } else {
-            g_string_append_printf(sov->string, "%" PRId64 "-%" PRId64,
-                                   r->begin, r->end - 1);
-        }
-    } else {
-        if (human) {
-            g_string_append_printf(sov->string, "0x%" PRIx64, r->begin);
-        } else {
-            g_string_append_printf(sov->string, "%" PRId64, r->begin);
-        }
-    }
-    if (next) {
-        g_string_append(sov->string, ",");
-    }
-}
-
-static void print_type_int64(Visitor *v, const char *name, int64_t *obj,
-                             Error **errp)
-{
-    StringOutputVisitor *sov = to_sov(v);
-    GList *l;
-
-    switch (sov->list_mode) {
-    case LM_NONE:
-        string_output_append(sov, *obj);
-        break;
-
-    case LM_STARTED:
-        sov->range_start.s = *obj;
-        sov->range_end.s = *obj;
-        sov->list_mode = LM_IN_PROGRESS;
-        return;
-
-    case LM_IN_PROGRESS:
-        if (sov->range_end.s + 1 == *obj) {
-            sov->range_end.s++;
-        } else {
-            if (sov->range_start.s == sov->range_end.s) {
-                string_output_append(sov, sov->range_end.s);
-            } else {
-                assert(sov->range_start.s < sov->range_end.s);
-                string_output_append_range(sov, sov->range_start.s,
-                                           sov->range_end.s);
-            }
-
-            sov->range_start.s = *obj;
-            sov->range_end.s = *obj;
-        }
-        return;
-
-    case LM_END:
-        if (sov->range_end.s + 1 == *obj) {
-            sov->range_end.s++;
-            assert(sov->range_start.s < sov->range_end.s);
-            string_output_append_range(sov, sov->range_start.s,
-                                       sov->range_end.s);
-        } else {
-            if (sov->range_start.s == sov->range_end.s) {
-                string_output_append(sov, sov->range_end.s);
-            } else {
-                assert(sov->range_start.s < sov->range_end.s);
-
-                string_output_append_range(sov, sov->range_start.s,
-                                           sov->range_end.s);
-            }
-            string_output_append(sov, *obj);
-        }
-        break;
-
-    default:
-        abort();
-    }
-
-    l = sov->ranges;
-    while (l) {
-        Range *r = l->data;
-        format_string(sov, r, l->next != NULL, false);
-        l = l->next;
-    }
-
-    if (sov->human) {
-        l = sov->ranges;
-        g_string_append(sov->string, " (");
-        while (l) {
-            Range *r = l->data;
-            format_string(sov, r, l->next != NULL, true);
-            l = l->next;
-        }
-        g_string_append(sov->string, ")");
-    }
-}
-
-static void print_type_uint64(Visitor *v, const char *name, uint64_t *obj,
-                             Error **errp)
-{
-    /* FIXME: print_type_int64 mishandles values over INT64_MAX */
-    int64_t i = *obj;
-    print_type_int64(v, name, &i, errp);
-}
-
-static void print_type_size(Visitor *v, const char *name, uint64_t *obj,
-                            Error **errp)
-{
-    StringOutputVisitor *sov = to_sov(v);
-    static const char suffixes[] = { 'B', 'K', 'M', 'G', 'T', 'P', 'E' };
-    uint64_t div, val;
-    char *out;
-    int i;
-
-    if (!sov->human) {
-        out = g_strdup_printf("%"PRIu64, *obj);
-        string_output_set(sov, out);
-        return;
-    }
-
-    val = *obj;
-
-    /* The exponent (returned in i) minus one gives us
-     * floor(log2(val * 1024 / 1000).  The correction makes us
-     * switch to the higher power when the integer part is >= 1000.
-     */
-    frexp(val / (1000.0 / 1024.0), &i);
-    i = (i - 1) / 10;
-    assert(i < ARRAY_SIZE(suffixes));
-    div = 1ULL << (i * 10);
-
-    out = g_strdup_printf("%"PRIu64" (%0.3g %c%s)", val,
-                          (double)val/div, suffixes[i], i ? "iB" : "");
-    string_output_set(sov, out);
-}
-
-static void print_type_bool(Visitor *v, const char *name, bool *obj,
-                            Error **errp)
-{
-    StringOutputVisitor *sov = to_sov(v);
-    string_output_set(sov, g_strdup(*obj ? "true" : "false"));
-}
-
-static void print_type_str(Visitor *v, const char *name, char **obj,
-                           Error **errp)
-{
-    StringOutputVisitor *sov = to_sov(v);
-    char *out;
-
-    if (sov->human) {
-        out = *obj ? g_strdup_printf("\"%s\"", *obj) : g_strdup("<null>");
-    } else {
-        out = g_strdup(*obj ? *obj : "");
-    }
-    string_output_set(sov, out);
-}
-
-static void print_type_number(Visitor *v, const char *name, double *obj,
-                              Error **errp)
-{
-    StringOutputVisitor *sov = to_sov(v);
-    string_output_set(sov, g_strdup_printf("%f", *obj));
-}
-
-static void
-start_list(Visitor *v, const char *name, Error **errp)
-{
-    StringOutputVisitor *sov = to_sov(v);
-
-    /* we can't traverse a list in a list */
-    assert(sov->list_mode == LM_NONE);
-    sov->list_mode = LM_STARTED;
-    sov->head = true;
-}
-
-static GenericList *next_list(Visitor *v, GenericList **list, size_t size)
-{
-    StringOutputVisitor *sov = to_sov(v);
-    GenericList *ret = NULL;
-    if (*list) {
-        if (sov->head) {
-            ret = *list;
-        } else {
-            ret = (*list)->next;
-        }
-
-        if (sov->head) {
-            if (ret && ret->next == NULL) {
-                sov->list_mode = LM_NONE;
-            }
-            sov->head = false;
-        } else {
-            if (ret && ret->next == NULL) {
-                sov->list_mode = LM_END;
-            }
-        }
-    }
-
-    return ret;
-}
-
-static void end_list(Visitor *v)
-{
-    StringOutputVisitor *sov = to_sov(v);
-
-    assert(sov->list_mode == LM_STARTED ||
-           sov->list_mode == LM_END ||
-           sov->list_mode == LM_NONE ||
-           sov->list_mode == LM_IN_PROGRESS);
-    sov->list_mode = LM_NONE;
-    sov->head = true;
-
-}
-
-char *string_output_get_string(StringOutputVisitor *sov)
-{
-    char *string = g_string_free(sov->string, false);
-    sov->string = NULL;
-    return string;
-}
-
-Visitor *string_output_get_visitor(StringOutputVisitor *sov)
-{
-    return &sov->visitor;
-}
-
-static void free_range(void *range, void *dummy)
-{
-    g_free(range);
-}
-
-void string_output_visitor_cleanup(StringOutputVisitor *sov)
-{
-    if (sov->string) {
-        g_string_free(sov->string, true);
-    }
-
-    g_list_foreach(sov->ranges, free_range, NULL);
-    g_list_free(sov->ranges);
-    g_free(sov);
-}
-
-StringOutputVisitor *string_output_visitor_new(bool human)
-{
-    StringOutputVisitor *v;
-
-    v = g_malloc0(sizeof(*v));
-
-    v->string = g_string_new(NULL);
-    v->human = human;
-    v->visitor.type_enum = output_type_enum;
-    v->visitor.type_int64 = print_type_int64;
-    v->visitor.type_uint64 = print_type_uint64;
-    v->visitor.type_size = print_type_size;
-    v->visitor.type_bool = print_type_bool;
-    v->visitor.type_str = print_type_str;
-    v->visitor.type_number = print_type_number;
-    v->visitor.start_list = start_list;
-    v->visitor.next_list = next_list;
-    v->visitor.end_list = end_list;
-
-    return v;
-}
diff --git a/qemu/qapi/trace.json b/qemu/qapi/trace.json
deleted file mode 100644
index 01b0a52a7..000000000
--- a/qemu/qapi/trace.json
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- mode: python -*-
-#
-# Copyright (C) 2011-2014 Lluís Vilanova <vilanova@ac.upc.edu>
-#
-# This work is licensed under the terms of the GNU GPL, version 2 or later.
-# See the COPYING file in the top-level directory.
-
-
-##
-# @TraceEventState:
-#
-# State of a tracing event.
-#
-# @unavailable: The event is statically disabled.
-#
-# @disabled: The event is dynamically disabled.
-#
-# @enabled: The event is dynamically enabled.
-#
-# Since 2.2
-##
-{ 'enum': 'TraceEventState',
-  'data': ['unavailable', 'disabled', 'enabled'] }
-
-##
-# @TraceEventInfo:
-#
-# Information of a tracing event.
-#
-# @name: Event name.
-# @state: Tracing state.
-#
-# Since 2.2
-##
-{ 'struct': 'TraceEventInfo',
-  'data': {'name': 'str', 'state': 'TraceEventState'} }
-
-##
-# @trace-event-get-state:
-#
-# Query the state of events.
-#
-# @name: Event name pattern (case-sensitive glob).
-#
-# Returns: a list of @TraceEventInfo for the matching events
-#
-# Since 2.2
-##
-{ 'command': 'trace-event-get-state',
-  'data': {'name': 'str'},
-  'returns': ['TraceEventInfo'] }
-
-##
-# @trace-event-set-state:
-#
-# Set the dynamic tracing state of events.
-#
-# @name: Event name pattern (case-sensitive glob).
-# @enable: Whether to enable tracing.
-# @ignore-unavailable: #optional Do not match unavailable events with @name.
-#
-# Since 2.2
-##
-{ 'command': 'trace-event-set-state',
-  'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool'} }