From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHFAQ-0006VX-KK for qemu-devel@nongnu.org; Mon, 20 Jul 2015 13:47:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHFAP-0001Z8-O4 for qemu-devel@nongnu.org; Mon, 20 Jul 2015 13:47:54 -0400 From: Max Reitz Date: Mon, 20 Jul 2015 19:45:54 +0200 Message-Id: <1437414365-11881-28-git-send-email-mreitz@redhat.com> In-Reply-To: <1437414365-11881-1-git-send-email-mreitz@redhat.com> References: <1437414365-11881-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v4 27/38] blockdev: Add blockdev-close-tray List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Alberto Garcia , John Snow , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Max Reitz Signed-off-by: Max Reitz --- blockdev.c | 23 +++++++++++++++++++++++ qapi/block-core.json | 16 ++++++++++++++++ qmp-commands.hx | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/blockdev.c b/blockdev.c index 265b7a9..7af6a71 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2111,6 +2111,29 @@ out: } } +void qmp_blockdev_close_tray(const char *device, Error **errp) +{ + BlockBackend *blk; + + 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; + } + + blk_dev_change_media_cb(blk, true); +} + /* 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 f593245..ad1f018 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1894,6 +1894,22 @@ 'data': { 'device': 'str', '*force': 'bool' } } +## +# @blockdev-close-tray: +# +# Closes a block device's tray. If there is a block driver state tree associated +# with the block device (which is currently ejected), that tree will be loaded +# as the medium. +# +# If the tray was already closed before, this will be a no-op. +# +# @device: block device name +# +# Since: 2.5 +## +{ 'command': 'blockdev-close-tray', + 'data': { 'device': 'str' } } + ## # @BlockErrorAction diff --git a/qmp-commands.hx b/qmp-commands.hx index 01c5d6e..aa7ec30 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3911,6 +3911,41 @@ Example: EQMP { + .name = "blockdev-close-tray", + .args_type = "device:s", + .mhandler.cmd_new = qmp_marshal_input_blockdev_close_tray, + }, + +SQMP +blockdev-close-tray +------------------- + +Closes a block device's tray. If there is a block driver state tree associated +with the block device (which is currently ejected), that tree will be loaded as +the medium. + +If the tray was already closed before, this will be a no-op. + +Arguments: + +- "device": block device name (json-string) + +Example: + +-> { "execute": "blockdev-close-tray", + "arguments": { "device": "ide1-cd0" } } + +<- { "timestamp": { "seconds": 1418751345, + "microseconds": 272147 }, + "event": "DEVICE_TRAY_MOVED", + "data": { "device": "ide1-cd0", + "tray-open": false } } + +<- { "return": {} } + +EQMP + + { .name = "query-named-block-nodes", .args_type = "", .mhandler.cmd_new = qmp_marshal_input_query_named_block_nodes, -- 2.4.6