From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHkKz-000368-SO for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHkKo-0002z3-A7 for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:34 -0500 Received: from [199.232.76.173] (port=46532 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHkKn-0002yx-G7 for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:29 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:47590) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NHkKm-0001T3-6d for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:29 -0500 Received: from crossbow.pond.sub.org (pD9E38C82.dip.t-dialin.net [217.227.140.130]) by oxygen.pond.sub.org (Postfix) with ESMTPA id D4E8A276D4F for ; Mon, 7 Dec 2009 21:37:23 +0100 (CET) From: Markus Armbruster Date: Mon, 7 Dec 2009 21:37:05 +0100 Message-Id: <1260218236-22143-8-git-send-email-armbru@redhat.com> In-Reply-To: <1260218236-22143-1-git-send-email-armbru@redhat.com> References: <1260218236-22143-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [FOR 0.12 PATCH 07/18] monitor: convert do_eject() to QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Also affects do_change(), because the two share eject_device(). Signed-off-by: Markus Armbruster --- monitor.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index b9d3d92..62d2ef5 100644 --- a/monitor.c +++ b/monitor.c @@ -778,11 +778,12 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force) if (bdrv_is_inserted(bs)) { if (!force) { if (!bdrv_is_removable(bs)) { - monitor_printf(mon, "device is not removable\n"); + qemu_error_new(QERR_DEVICE_NOT_REMOVABLE, + bdrv_get_device_name(bs)); return -1; } if (bdrv_is_locked(bs)) { - monitor_printf(mon, "device is locked\n"); + qemu_error_new(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); return -1; } } @@ -799,7 +800,7 @@ static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) bs = bdrv_find(filename); if (!bs) { - monitor_printf(mon, "device not found\n"); + qemu_error_new(QERR_DEVICE_NOT_FOUND, filename); return; } eject_device(mon, bs, force); -- 1.6.2.5