diff options
| author | Peter Maydell | 2015-03-19 18:47:08 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-19 18:47:08 +0100 |
| commit | 3e5f6234b4f45a11b7c357dde2d6da36641bc6f6 (patch) | |
| tree | f6770b2c458dbfeedccd2346543107971654b783 /qapi/block-core.json | |
| parent | Merge remote-tracking branch 'remotes/amit/tags/vser-for-2.3-3' into staging (diff) | |
| parent | block: Fix blockdev-backup not to use funky error class (diff) | |
| download | qemu-3e5f6234b4f45a11b7c357dde2d6da36641bc6f6.tar.gz qemu-3e5f6234b4f45a11b7c357dde2d6da36641bc6f6.tar.xz qemu-3e5f6234b4f45a11b7c357dde2d6da36641bc6f6.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.3.0-rc1
# gpg: Signature made Thu Mar 19 15:03:26 2015 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block: Fix blockdev-backup not to use funky error class
raw-posix: Deprecate aio=threads fallback without O_DIRECT
raw-posix: Deprecate host floppy passthrough
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi/block-core.json')
| -rw-r--r-- | qapi/block-core.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 42c885047f..f525b04355 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -218,6 +218,7 @@ # 'host_floppy', 'http', 'https', 'nbd', 'parallels', 'qcow', # 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat' # 2.2: 'archipelago' added, 'cow' dropped +# 2.3: 'host_floppy' deprecated # # @backing_file: #optional the name of the backing file (for copy-on-write) # @@ -881,9 +882,6 @@ # # For the arguments, see the documentation of BlockdevBackup. # -# Returns: Nothing on success. -# If @device or @target is not a valid block device, DeviceNotFound. -# # Since 2.3 ## { 'command': 'blockdev-backup', 'data': 'BlockdevBackup' } @@ -1245,6 +1243,7 @@ # Drivers that are supported in block device operations. # # @host_device, @host_cdrom, @host_floppy: Since 2.1 +# @host_floppy: deprecated since 2.3 # # Since: 2.0 ## |