From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <famz@redhat.com>,
Jeff Cody <jcody@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Max Reitz <mreitz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
john@redhat.com
Subject: [Qemu-devel] [PATCH 38/50] blockdev: Add blockdev-open-tray
Date: Mon, 26 Jan 2015 11:03:12 -0500 [thread overview]
Message-ID: <1422288204-29271-39-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1422288204-29271-1-git-send-email-mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
blockdev.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
qapi/block-core.json | 21 +++++++++++++++++++++
qmp-commands.hx | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 2f3ccb5..a0b9f17 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1993,6 +1993,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 ca9bc32..029f08b 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1718,6 +1718,27 @@
##
{ '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).
+#
+# @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 7576c18..cfa1b98 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -3641,6 +3641,43 @@ 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).
+
+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 (1):
+
+-> { "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.1.0
next prev parent reply other threads:[~2015-01-26 16:04 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-26 16:02 [Qemu-devel] [PATCH 00/50] blockdev: BlockBackend and media Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 01/50] blockdev: Allow creation of BDS trees without BB Max Reitz
2015-01-27 18:22 ` Eric Blake
2015-01-27 18:26 ` Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 02/50] iotests: Only create BB if necessary Max Reitz
2015-01-27 18:49 ` Eric Blake
2015-01-26 16:02 ` [Qemu-devel] [PATCH 03/50] hw/block/fdc: Implement tray status Max Reitz
2015-01-27 18:58 ` Eric Blake
2015-01-26 16:02 ` [Qemu-devel] [PATCH 04/50] hw/usb-storage: Check whether BB is inserted Max Reitz
2015-01-27 19:05 ` Eric Blake
2015-01-26 16:02 ` [Qemu-devel] [PATCH 05/50] block: Fix BB AIOCB AioContext without BDS Max Reitz
2015-01-27 19:12 ` Eric Blake
2015-01-26 16:02 ` [Qemu-devel] [PATCH 06/50] block: Add blk_is_available() Max Reitz
2015-01-27 19:15 ` Eric Blake
2015-01-27 19:16 ` Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 07/50] block: Make bdrv_is_inserted() recursive Max Reitz
2015-01-27 19:18 ` Eric Blake
2015-01-26 16:02 ` [Qemu-devel] [PATCH 08/50] block/quorum: Implement bdrv_is_inserted() Max Reitz
2015-01-27 19:20 ` Eric Blake
2015-01-26 16:02 ` [Qemu-devel] [PATCH 09/50] block: Move guest_block_size into BlockBackend Max Reitz
2015-01-27 19:22 ` Eric Blake
2015-01-27 19:37 ` John Priddy
2015-01-27 19:40 ` Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 10/50] block: Remove wr_highest_offset from BlockAcctStats Max Reitz
2015-01-27 20:01 ` Eric Blake
2015-01-27 20:02 ` Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 11/50] block: Move BlockAcctStats into BlockBackend Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 12/50] block: Move I/O status and error actions into BB Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 13/50] block: Add BlockBackendRootState Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 14/50] block: Make some BB functions fall back to BBRS Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 15/50] block: Fail requests to empty BlockBackend Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 16/50] block: Prepare remaining BB functions for NULL BDS Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 17/50] block: Respect empty BB in bdrv_lookup_bs() Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 18/50] block: Respect empty BB in bdrv_query_info() Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 19/50] blockdev: Use BlockBackend for blockdev-backup TA Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 20/50] blockdev: Check blk_is_available() in sn-del-int-sync Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 21/50] blockdev: Check BB validity in internal snapshot TA Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 22/50] blockdev: Check BB validity in drive-backup TA Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 23/50] blockdev: Catch NULL BDS in block_set_io_throttle Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 24/50] blockdev: Check BB validity in block-stream Max Reitz
2015-01-26 16:02 ` [Qemu-devel] [PATCH 25/50] blockdev: Check BB validity in block-commit Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 26/50] blockdev: Check BB validity in drive-backup Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 27/50] blockdev: Check BB validity in blockdev-backup Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 28/50] blockdev: Check BB validity in drive-mirror Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 29/50] blockdev: Check BB validity in find_block_job() Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 30/50] blockdev: Check BB validity in change-backing-file Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 31/50] block: Add blk_insert_bs() Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 32/50] blockdev: Check BB validity in eject and change Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 33/50] blockdev: Respect NULL BDS in do_drive_del() Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 34/50] blockdev: Do not create BDS for empty drive Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 35/50] blockdev: Pull out blockdev option extraction Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 36/50] blockdev: Allow more options for BB-less BDS tree Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 37/50] block: Add blk_remove_bs() Max Reitz
2015-01-26 16:03 ` Max Reitz [this message]
2015-01-26 16:03 ` [Qemu-devel] [PATCH 39/50] blockdev: Add blockdev-close-tray Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 40/50] blockdev: Add blockdev-remove-medium Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 41/50] blockdev: Add blockdev-insert-medium Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 42/50] blockdev: Implement eject with basic operations Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 43/50] blockdev: Implement change " Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 44/50] block: Inquire tray state before tray-moved events Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 45/50] qmp: Introduce blockdev-change-medium Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 46/50] hmp: Use blockdev-change-medium for change command Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 47/50] blockdev: Add read-only option to blockdev-change-medium Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 48/50] hmp: Add read-only option to change command Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 49/50] iotests: More options for VM.add_drive() Max Reitz
2015-01-26 16:03 ` [Qemu-devel] [PATCH 50/50] iotests: Add test for change-related QMP commands Max Reitz
2015-01-27 19:30 ` [Qemu-devel] [PATCH 00/50] blockdev: BlockBackend and media Eric Blake
2015-01-27 19:38 ` Max Reitz
2015-01-27 19:49 ` 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=1422288204-29271-39-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=armbru@redhat.com \
--cc=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=john@redhat.com \
--cc=kwolf@redhat.com \
--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).