From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>,
John Snow <jsnow@redhat.com>,
qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v4 26/38] blockdev: Add blockdev-open-tray
Date: Mon, 20 Jul 2015 19:45:53 +0200 [thread overview]
Message-ID: <1437414365-11881-27-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1437414365-11881-1-git-send-email-mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
blockdev.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
qapi/block-core.json | 23 +++++++++++++++++++++++
qmp-commands.hx | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 111 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 44a8c6b..265b7a9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2062,6 +2062,55 @@ out:
aio_context_release(aio_context);
}
+void qmp_blockdev_open_tray(const char *device, bool has_force, bool force,
+ Error **errp)
+{
+ BlockBackend *blk;
+ BlockDriverState *bs;
+ AioContext *aio_context = NULL;
+
+ 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;
+ }
+
+ bs = blk_bs(blk);
+ if (bs) {
+ aio_context = bdrv_get_aio_context(bs);
+ aio_context_acquire(aio_context);
+
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_EJECT, errp)) {
+ goto out;
+ }
+ }
+
+ if (blk_dev_is_medium_locked(blk)) {
+ blk_dev_eject_request(blk, force);
+ } else {
+ blk_dev_change_media_cb(blk, false);
+ }
+
+out:
+ if (aio_context) {
+ aio_context_release(aio_context);
+ }
+}
+
/* 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 bc12934..f593245 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1871,6 +1871,29 @@
##
{ '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.
+#
+# @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 df3b116..01c5d6e 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -3872,6 +3872,45 @@ Example (2):
EQMP
{
+ .name = "blockdev-open-tray",
+ .args_type = "device:s,force:b?",
+ .mhandler.cmd_new = qmp_marshal_input_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.
+
+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_input_query_named_block_nodes,
--
2.4.6
next prev parent reply other threads:[~2015-07-20 17:48 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 17:45 [Qemu-devel] [PATCH v4 00/38] blockdev: BlockBackend and media Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 01/38] block: Remove host floppy support Max Reitz
2015-09-07 15:59 ` Kevin Wolf
2015-09-07 16:26 ` Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 02/38] blockdev: Allow creation of BDS trees without BB Max Reitz
2015-09-07 16:12 ` Kevin Wolf
2015-09-07 16:38 ` Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 03/38] iotests: Only create BB if necessary Max Reitz
2015-09-07 16:20 ` Kevin Wolf
2015-09-07 16:54 ` Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 04/38] block: Make bdrv_is_inserted() return a bool Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 05/38] block: Add blk_is_available() Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 06/38] block: Make bdrv_is_inserted() recursive Max Reitz
2015-09-07 17:43 ` Kevin Wolf
2015-09-07 18:03 ` Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 07/38] block/quorum: Implement bdrv_is_inserted() Max Reitz
2015-09-07 18:03 ` Kevin Wolf
2015-09-07 18:04 ` Max Reitz
2015-09-07 18:16 ` Kevin Wolf
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 08/38] block: Invoke change media CB before NULLing drv Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 09/38] hw/block/fdc: Implement tray status Max Reitz
2015-09-07 18:13 ` Kevin Wolf
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 10/38] hw/usb-storage: Check whether BB is inserted Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 11/38] block: Fix BB AIOCB AioContext without BDS Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 12/38] block: Move guest_block_size into BlockBackend Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 13/38] block: Remove wr_highest_sector from BlockAcctStats Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 14/38] block: Move BlockAcctStats into BlockBackend Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 15/38] block: Move I/O status and error actions into BB Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 16/38] block: Add BlockBackendRootState Max Reitz
2015-09-11 23:20 ` Eric Blake
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 17/38] block: Make some BB functions fall back to BBRS Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 18/38] block: Fail requests to empty BlockBackend Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 19/38] block: Prepare remaining BB functions for NULL BDS Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 20/38] block: Add blk_insert_bs() Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 21/38] block: Prepare for NULL BDS Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 22/38] blockdev: Do not create BDS for empty drive Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 23/38] blockdev: Pull out blockdev option extraction Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 24/38] blockdev: Allow more options for BB-less BDS tree Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 25/38] block: Add blk_remove_bs() Max Reitz
2015-07-20 17:45 ` Max Reitz [this message]
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 27/38] blockdev: Add blockdev-close-tray Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 28/38] blockdev: Add blockdev-remove-medium Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 29/38] blockdev: Add blockdev-insert-medium Max Reitz
2015-09-08 5:53 ` Wen Congyang
2015-09-08 15:57 ` Eric Blake
2015-09-08 9:13 ` Wen Congyang
2015-09-08 21:20 ` Max Reitz
2015-09-09 10:01 ` Wen Congyang
2015-09-09 12:59 ` Max Reitz
2015-09-10 1:12 ` Wen Congyang
2015-09-10 19:09 ` Max Reitz
2015-09-11 7:30 ` Wen Congyang
2015-09-11 17:01 ` Max Reitz
2015-09-10 3:22 ` Wen Congyang
2015-09-10 19:10 ` Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 30/38] blockdev: Implement eject with basic operations Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 31/38] blockdev: Implement change " Max Reitz
2015-07-20 17:45 ` [Qemu-devel] [PATCH v4 32/38] block: Inquire tray state before tray-moved events Max Reitz
2015-07-20 17:46 ` [Qemu-devel] [PATCH v4 33/38] qmp: Introduce blockdev-change-medium Max Reitz
2015-07-20 17:46 ` [Qemu-devel] [PATCH v4 34/38] hmp: Use blockdev-change-medium for change command Max Reitz
2015-07-20 17:46 ` [Qemu-devel] [PATCH v4 35/38] blockdev: read-only-mode for blockdev-change-medium Max Reitz
2015-07-20 17:46 ` [Qemu-devel] [PATCH v4 36/38] hmp: Add read-only-mode option to change command Max Reitz
2015-07-20 17:46 ` [Qemu-devel] [PATCH v4 37/38] iotests: More options for VM.add_drive() Max Reitz
2015-07-20 17:46 ` [Qemu-devel] [PATCH v4 38/38] iotests: Add test for change-related QMP commands Max Reitz
2015-09-02 15:02 ` [Qemu-devel] [PATCH v4 00/38] blockdev: BlockBackend and media Eric Blake
2015-09-07 5:53 ` Wen Congyang
2015-09-07 18:42 ` 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=1437414365-11881-27-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=armbru@redhat.com \
--cc=berto@igalia.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).