qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Max Reitz <mreitz@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PATCH v3 26/38] blockdev: Add blockdev-open-tray
Date: Wed,  3 Jun 2015 21:44:07 +0200	[thread overview]
Message-ID: <1433360659-1915-27-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1433360659-1915-1-git-send-email-mreitz@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 blockdev.c           | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 qapi/block-core.json | 23 +++++++++++++++++++++++
 qmp-commands.hx      | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/blockdev.c b/blockdev.c
index 03d6334..6d9cb12 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2036,6 +2036,54 @@ 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, QERR_DEVICE_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 071b6ee..dfb2b70 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1836,6 +1836,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.3
+##
+{ 'command': 'blockdev-open-tray',
+  'data': { 'device': 'str',
+            '*force': 'bool' } }
+
 
 ##
 # @BlockErrorAction
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 324db4b..85f3c6f 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -3867,6 +3867,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.1

  parent reply	other threads:[~2015-06-03 19:45 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-03 19:43 [Qemu-devel] [PATCH v3 00/38] blockdev: BlockBackend and media Max Reitz
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 01/38] block: Remove host floppy support Max Reitz
2015-06-03 20:08   ` Eric Blake
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 02/38] blockdev: Allow creation of BDS trees without BB Max Reitz
2015-06-03 20:15   ` Eric Blake
2015-06-05 10:56   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 03/38] iotests: Only create BB if necessary Max Reitz
2015-06-05 10:04   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 04/38] block: Make bdrv_is_inserted() return a bool Max Reitz
2015-06-03 20:19   ` Eric Blake
2015-06-04 12:14   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 05/38] block: Add blk_is_available() Max Reitz
2015-06-04 12:22   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 06/38] block: Make bdrv_is_inserted() recursive Max Reitz
2015-06-04 12:28   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 07/38] block/quorum: Implement bdrv_is_inserted() Max Reitz
2015-06-04 12:37   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-04 12:46     ` Eric Blake
2015-06-05 15:29     ` Max Reitz
2015-06-17  8:56   ` Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 08/38] block: Invoke change media CB before NULLing drv Max Reitz
2015-06-03 20:25   ` Eric Blake
2015-06-04 14:07   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 09/38] hw/block/fdc: Implement tray status Max Reitz
2015-06-03 20:29   ` Eric Blake
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 10/38] hw/usb-storage: Check whether BB is inserted Max Reitz
2015-06-03 20:37   ` Eric Blake
2015-06-05 15:05     ` Max Reitz
2015-06-04 12:40   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 11/38] block: Fix BB AIOCB AioContext without BDS Max Reitz
2015-06-04 14:29   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 12/38] block: Move guest_block_size into BlockBackend Max Reitz
2015-06-03 20:41   ` Eric Blake
2015-06-04 14:09   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 13/38] block: Remove wr_highest_sector from BlockAcctStats Max Reitz
2015-06-03 20:47   ` Eric Blake
2015-06-05 10:10   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 14/38] block: Move BlockAcctStats into BlockBackend Max Reitz
2015-06-03 20:52   ` Eric Blake
2015-06-05 10:47     ` Alberto Garcia
2015-06-05 12:35       ` Eric Blake
2015-06-05 10:57   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 15/38] block: Move I/O status and error actions into BB Max Reitz
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 16/38] block: Add BlockBackendRootState Max Reitz
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 17/38] block: Make some BB functions fall back to BBRS Max Reitz
2015-06-03 19:43 ` [Qemu-devel] [PATCH v3 18/38] block: Fail requests to empty BlockBackend Max Reitz
2015-06-03 20:57   ` Eric Blake
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 19/38] block: Prepare remaining BB functions for NULL BDS Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 20/38] block: Add blk_insert_bs() Max Reitz
2015-06-05 15:13   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 21/38] block: Prepare for NULL BDS Max Reitz
2015-06-03 21:02   ` Eric Blake
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 22/38] blockdev: Do not create BDS for empty drive Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 23/38] blockdev: Pull out blockdev option extraction Max Reitz
2015-06-09  0:37   ` Fam Zheng
2015-06-09 19:03     ` Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 24/38] blockdev: Allow more options for BB-less BDS tree Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 25/38] block: Add blk_remove_bs() Max Reitz
2015-06-03 19:44 ` Max Reitz [this message]
2015-06-03 21:24   ` [Qemu-devel] [PATCH v3 26/38] blockdev: Add blockdev-open-tray Eric Blake
2015-06-05 15:06     ` Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 27/38] blockdev: Add blockdev-close-tray Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 28/38] blockdev: Add blockdev-remove-medium Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 29/38] blockdev: Add blockdev-insert-medium Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 30/38] blockdev: Implement eject with basic operations Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 31/38] blockdev: Implement change " Max Reitz
2015-06-03 21:31   ` Eric Blake
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 32/38] block: Inquire tray state before tray-moved events Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 33/38] qmp: Introduce blockdev-change-medium Max Reitz
2015-06-03 21:37   ` Eric Blake
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 34/38] hmp: Use blockdev-change-medium for change command Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 35/38] blockdev: read-only-mode for blockdev-change-medium Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 36/38] hmp: Add read-only-mode option to change command Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 37/38] iotests: More options for VM.add_drive() Max Reitz
2015-06-03 19:44 ` [Qemu-devel] [PATCH v3 38/38] iotests: Add test for change-related QMP commands Max Reitz
2015-06-03 21:46   ` Eric Blake
2015-06-05 15:08     ` 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=1433360659-1915-27-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=armbru@redhat.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).