From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZljIq-0000bf-9Y for qemu-devel@nongnu.org; Mon, 12 Oct 2015 16:02:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZljIp-0001Gw-IO for qemu-devel@nongnu.org; Mon, 12 Oct 2015 16:02:36 -0400 From: Max Reitz Date: Mon, 12 Oct 2015 22:00:35 +0200 Message-Id: <1444680042-13207-33-git-send-email-mreitz@redhat.com> In-Reply-To: <1444680042-13207-1-git-send-email-mreitz@redhat.com> References: <1444680042-13207-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 32/39] blockdev: Implement eject with basic operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Alberto Garcia , Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , John Snow , Stefan Hajnoczi Implement 'eject' by calling blockdev-open-tray and blockdev-remove-medium. Signed-off-by: Max Reitz --- blockdev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c index 706e7e1..ff3b353 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1952,16 +1952,15 @@ out: void qmp_eject(const char *device, bool has_force, bool force, Error **errp) { - BlockBackend *blk; + Error *local_err = NULL; - blk = blk_by_name(device); - if (!blk) { - error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, - "Device '%s' not found", device); + qmp_blockdev_open_tray(device, has_force, force, &local_err); + if (local_err) { + error_propagate(errp, local_err); return; } - eject_device(blk, force, errp); + qmp_blockdev_remove_medium(device, errp); } void qmp_block_passwd(bool has_device, const char *device, -- 2.6.1