From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFm98-0006XN-Pn for qemu-devel@nongnu.org; Mon, 26 Jan 2015 11:04:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFm92-0005JD-Ki for qemu-devel@nongnu.org; Mon, 26 Jan 2015 11:04:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFm92-0005Iz-6a for qemu-devel@nongnu.org; Mon, 26 Jan 2015 11:04:08 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0QG47Sk015566 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 26 Jan 2015 11:04:07 -0500 From: Max Reitz Date: Mon, 26 Jan 2015 11:03:13 -0500 Message-Id: <1422288204-29271-40-git-send-email-mreitz@redhat.com> In-Reply-To: <1422288204-29271-1-git-send-email-mreitz@redhat.com> References: <1422288204-29271-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 39/50] blockdev: Add blockdev-close-tray List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Jeff Cody , Markus Armbruster , Max Reitz , Stefan Hajnoczi , john@redhat.com Signed-off-by: Max Reitz --- blockdev.c | 22 ++++++++++++++++++++++ qapi/block-core.json | 14 ++++++++++++++ qmp-commands.hx | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/blockdev.c b/blockdev.c index a0b9f17..d6a3fdf 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2041,6 +2041,28 @@ out: } } +void qmp_blockdev_close_tray(const char *device, Error **errp) +{ + BlockBackend *blk; + + 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; + } + + 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 029f08b..802734a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1739,6 +1739,20 @@ '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. +# +# @device: block device name +# +# Since: 2.3 +## +{ 'command': 'blockdev-close-tray', + 'data': { 'device': 'str' } } + ## # @BlockErrorAction diff --git a/qmp-commands.hx b/qmp-commands.hx index cfa1b98..5927507 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3678,6 +3678,39 @@ Example (1): 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. + +Arguments: + +- "device": block device name (json-string) + +Example (1): + +-> { "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.1.0