From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGC6i-0007V7-ML for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:47:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGC6c-0002IH-Gq for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:47:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGC6c-0002H8-2D for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:47:22 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0RJlKDK028477 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 27 Jan 2015 14:47:21 -0500 From: Max Reitz Date: Tue, 27 Jan 2015 14:46:15 -0500 Message-Id: <1422387983-32153-43-git-send-email-mreitz@redhat.com> In-Reply-To: <1422387983-32153-1-git-send-email-mreitz@redhat.com> References: <1422387983-32153-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH RESEND 42/50] blockdev: Implement eject with basic operations 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 Snow Implement 'eject' by calling blockdev-open-tray and blockdev-remove-medium. Signed-off-by: Max Reitz --- blockdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c index e4588b3..0b204eb 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1865,15 +1865,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, QERR_DEVICE_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.1.0