[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 38/50] blockdev: Add blockdev-open-tray
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 38/50] blockdev: Add blockdev-open-tray |
Date: |
Mon, 26 Jan 2015 11:03:12 -0500 |
Signed-off-by: Max Reitz <address@hidden>
---
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
- [Qemu-devel] [PATCH 32/50] blockdev: Check BB validity in eject and change, (continued)
- [Qemu-devel] [PATCH 32/50] blockdev: Check BB validity in eject and change, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 31/50] block: Add blk_insert_bs(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 33/50] blockdev: Respect NULL BDS in do_drive_del(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 30/50] blockdev: Check BB validity in change-backing-file, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 37/50] block: Add blk_remove_bs(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 36/50] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 35/50] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 43/50] blockdev: Implement change with basic operations, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 44/50] block: Inquire tray state before tray-moved events, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 39/50] blockdev: Add blockdev-close-tray, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 38/50] blockdev: Add blockdev-open-tray,
Max Reitz <=
- [Qemu-devel] [PATCH 40/50] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 49/50] iotests: More options for VM.add_drive(), Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 42/50] blockdev: Implement eject with basic operations, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 45/50] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 41/50] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 46/50] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 47/50] blockdev: Add read-only option to blockdev-change-medium, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 50/50] iotests: Add test for change-related QMP commands, Max Reitz, 2015/01/26
- [Qemu-devel] [PATCH 48/50] hmp: Add read-only option to change command, Max Reitz, 2015/01/26
- Re: [Qemu-devel] [PATCH 00/50] blockdev: BlockBackend and media, Eric Blake, 2015/01/27