summaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2016-01-29 20:49:11 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2016-03-17 16:23:54 -0500
commit6a49a71cc652431538ba7ed00379fbaab1e7343c (patch)
treef0444f6828ff3be9683fdad793da74252695e7cd /qapi
parente1a8a0912489d667ab7b35f8dd6ae9ec1de7ca20 (diff)
downloadqemu-6a49a71cc652431538ba7ed00379fbaab1e7343c.tar.gz
blockdev: Fix 'change' for slot devices
'change' and related operations did not work when used on guest devices featuring removable media but no actual tray, because blk_dev_is_tray_open() always returned false for them and the blockdev-{insert,remove}-medium commands required it to return true. Fix this by making blockdev-{insert,remove}-medium work on tray-less devices. Also, blockdev-{open,close}-tray are now explicitly no-ops when invoked on such devices, and blk_dev_change_media_cb() is instead called by blockdev-{insert,remove}-medium (for tray-less devices only). Reported-by: Peter Maydell <peter.maydell@linaro.org> Cc: qemu-stable <qemu-stable@nongnu.org> Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Message-id: 1454096953-31773-3-git-send-email-mreitz@redhat.com Reviewed-by: Eric Blake <eblake@redhat.com> (cherry picked from commit 12c7ec87a7d88919b23736176eba3118d1521372) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/block-core.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 5a23165dfa..419f1124e8 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2048,8 +2048,7 @@
# 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 and is empty, for instance
-# for floppy disk drives
+# - if the guest device does not have an actual tray
#
# @device: block device name
#