From patchwork Mon Jan 9 11:24:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 134997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9E723B6F65 for ; Mon, 9 Jan 2012 22:25:20 +1100 (EST) Received: from localhost ([::1]:36813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkDLj-0001hW-1l for incoming@patchwork.ozlabs.org; Mon, 09 Jan 2012 06:25:11 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkDLD-0000ew-0I for qemu-devel@nongnu.org; Mon, 09 Jan 2012 06:24:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RkDL7-0006gB-9x for qemu-devel@nongnu.org; Mon, 09 Jan 2012 06:24:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkDL7-0006g1-09 for qemu-devel@nongnu.org; Mon, 09 Jan 2012 06:24:33 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q09BOUng009220 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Jan 2012 06:24:30 -0500 Received: from localhost (ovpn-113-68.phx2.redhat.com [10.3.113.68]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q09BOTUA020426; Mon, 9 Jan 2012 06:24:30 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 9 Jan 2012 09:24:11 -0200 Message-Id: <1326108257-13042-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1326108257-13042-1-git-send-email-lcapitulino@redhat.com> References: <1326108257-13042-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 04/10] block: eject_device(): Use error_set() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also drops the leftover 'mon' argument. This is a preparation for the next commits which will port the eject and change commands to the QAPI. Signed-off-by: Luiz Capitulino --- blockdev.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index c832782..9ee5bae 100644 --- a/blockdev.c +++ b/blockdev.c @@ -665,21 +665,22 @@ void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file, } } -static int eject_device(Monitor *mon, BlockDriverState *bs, int force) +static void eject_device(BlockDriverState *bs, int force, Error **errp) { if (!bdrv_dev_has_removable_media(bs)) { - qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs)); - return -1; + error_set(errp, QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs)); + return; } + if (bdrv_dev_is_medium_locked(bs) && !bdrv_dev_is_tray_open(bs)) { bdrv_dev_eject_request(bs, force); if (!force) { - qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); - return -1; + error_set(errp, QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); + return; } } + bdrv_close(bs); - return 0; } int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) @@ -687,13 +688,22 @@ int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) BlockDriverState *bs; int force = qdict_get_try_bool(qdict, "force", 0); const char *filename = qdict_get_str(qdict, "device"); + Error *err = NULL; bs = bdrv_find(filename); if (!bs) { qerror_report(QERR_DEVICE_NOT_FOUND, filename); return -1; } - return eject_device(mon, bs, force); + + eject_device(bs, force, &err); + if (error_is_set(&err)) { + qerror_report_err(err); + error_free(err); + return -1; + } + + return 0; } void qmp_block_passwd(const char *device, const char *password, Error **errp) @@ -723,6 +733,7 @@ int do_change_block(Monitor *mon, const char *device, BlockDriverState *bs; BlockDriver *drv = NULL; int bdrv_flags; + Error *err = NULL; bs = bdrv_find(device); if (!bs) { @@ -736,7 +747,10 @@ int do_change_block(Monitor *mon, const char *device, return -1; } } - if (eject_device(mon, bs, 0) < 0) { + eject_device(bs, 0, &err); + if (error_is_set(&err)) { + qerror_report_err(err); + error_free(err); return -1; } bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR;