From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 05/37] blockdev: Add blockdev-open-tray
Date: Thu, 5 Nov 2015 19:17:33 +0100 [thread overview]
Message-ID: <1446747485-6562-6-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1446747485-6562-1-git-send-email-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
blockdev.c | 36 ++++++++++++++++++++++++++++++++++++
qapi/block-core.json | 32 ++++++++++++++++++++++++++++++++
qmp-commands.hx | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 8b8bfa9..be241eb 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2078,6 +2078,42 @@ out:
aio_context_release(aio_context);
}
+void qmp_blockdev_open_tray(const char *device, bool has_force, bool force,
+ Error **errp)
+{
+ BlockBackend *blk;
+ bool locked;
+
+ if (!has_force) {
+ force = false;
+ }
+
+ blk = blk_by_name(device);
+ if (!blk) {
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+ "Device '%s' not found", device);
+ return;
+ }
+
+ if (!blk_dev_has_removable_media(blk)) {
+ error_setg(errp, "Device '%s' is not removable", device);
+ return;
+ }
+
+ if (blk_dev_is_tray_open(blk)) {
+ return;
+ }
+
+ locked = blk_dev_is_medium_locked(blk);
+ if (locked) {
+ blk_dev_eject_request(blk, force);
+ }
+
+ if (!locked || force) {
+ blk_dev_change_media_cb(blk, false);
+ }
+}
+
/* throttling disk I/O limits */
void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd,
int64_t bps_wr,
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 425fdab..b65ab81 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1876,6 +1876,38 @@
##
{ 'command': 'blockdev-add', 'data': { 'options': 'BlockdevOptions' } }
+##
+# @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 and is empty, for instance
+# for floppy disk drives
+#
+# @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' } }
+
##
# @BlockErrorAction
diff --git a/qmp-commands.hx b/qmp-commands.hx
index d7cf0ff..0b796f9 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -3936,6 +3936,54 @@ Example (2):
EQMP
{
+ .name = "blockdev-open-tray",
+ .args_type = "device:s,force:b?",
+ .mhandler.cmd_new = qmp_marshal_blockdev_open_tray,
+ },
+
+SQMP
+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 and is empty, for instance
+ for floppy disk drives
+
+Arguments:
+
+- "device": block device name (json-string)
+- "force": 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
+ (json-bool, optional)
+
+Example:
+
+-> { "execute": "blockdev-open-tray",
+ "arguments": { "device": "ide1-cd0" } }
+
+<- { "timestamp": { "seconds": 1418751016,
+ "microseconds": 716996 },
+ "event": "DEVICE_TRAY_MOVED",
+ "data": { "device": "ide1-cd0",
+ "tray-open": true } }
+
+<- { "return": {} }
+
+EQMP
+
+ {
.name = "query-named-block-nodes",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_query_named_block_nodes,
--
1.8.3.1
next prev parent reply other threads:[~2015-11-05 18:18 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 18:17 [Qemu-devel] [PULL 00/37] Block layer patches Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 01/37] block: Don't call blk_bs() twice in bdrv_lookup_bs() Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 02/37] block: Add blk_remove_bs() Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 03/37] block: Make bdrv_states public Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 04/37] block: Add functions for inheriting a BBRS Kevin Wolf
2015-11-05 18:17 ` Kevin Wolf [this message]
2015-11-05 18:17 ` [Qemu-devel] [PULL 06/37] blockdev: Add blockdev-close-tray Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 07/37] blockdev: Add blockdev-remove-medium Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 08/37] blockdev: Add blockdev-insert-medium Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 09/37] blockdev: Implement eject with basic operations Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 10/37] blockdev: Implement change " Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 11/37] block: Inquire tray state before tray-moved events Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 12/37] qmp: Introduce blockdev-change-medium Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 13/37] hmp: Use blockdev-change-medium for change command Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 14/37] blockdev: read-only-mode for blockdev-change-medium Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 15/37] hmp: Add read-only-mode option to change command Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 16/37] iotests: Add test for change-related QMP commands Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 17/37] block: check for existing device IDs in external_snapshot_prepare() Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 18/37] block: rename BlockdevSnapshot to BlockdevSnapshotSync Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 19/37] block: support passing 'backing': '' to 'blockdev-add' Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 20/37] block: add a 'blockdev-snapshot' QMP command Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 21/37] block: add tests for the 'blockdev-snapshot' command Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 22/37] commit: reopen overlay_bs before base Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 23/37] qemu-iotests: Test the reopening of overlay_bs in 'block-commit' Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 24/37] qcow2: avoid misaligned 64bit bswap Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 25/37] qemu-img: add check for zero-length job len Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 26/37] throttle: Check for pending requests in throttle_group_unregister_bs() Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 27/37] throttle: Use bs->throttle_state instead of bs->io_limits_enabled Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 28/37] block: Disallow snapshots if the overlay doesn't support backing files Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 29/37] block: Remove inner quotation marks in iotest 085 Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 30/37] block: test 'blockdev-snapshot' using a file BDS as the overlay Kevin Wolf
2015-11-05 18:17 ` [Qemu-devel] [PULL 31/37] qemu-iotests: fix cleanup of background processes Kevin Wolf
2015-11-05 18:18 ` [Qemu-devel] [PULL 32/37] qemu-iotests: fix -valgrind option for check Kevin Wolf
2015-11-05 18:18 ` [Qemu-devel] [PULL 33/37] mirror: block all operations on the target image during the job Kevin Wolf
2015-11-05 18:18 ` [Qemu-devel] [PULL 34/37] block: Add blk_get_refcnt() Kevin Wolf
2015-11-05 18:18 ` [Qemu-devel] [PULL 35/37] block: Add 'x-blockdev-del' QMP command Kevin Wolf
2015-11-05 18:18 ` [Qemu-devel] [PULL 36/37] iotests: Add tests for the x-blockdev-del command Kevin Wolf
2015-11-05 18:18 ` [Qemu-devel] [PULL 37/37] qcow2: Fix qcow2_get_cluster_offset() for zero clusters Kevin Wolf
2015-11-05 19:01 ` [Qemu-devel] [PULL 00/37] Block layer patches Peter Maydell
2015-11-06 8:17 ` Kevin Wolf
2015-11-06 15:10 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446747485-6562-6-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).