From patchwork Thu Feb 11 01:49:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 45083 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D7A1B7C33 for ; Thu, 11 Feb 2010 13:01:01 +1100 (EST) Received: from localhost ([127.0.0.1]:49849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfOMU-0002aI-Gw for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 21:00:58 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfOCP-0006pm-61 for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:33 -0500 Received: from [199.232.76.173] (port=57720 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfOCO-0006pB-LI for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:32 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfOCM-0001GA-4U for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50155) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfOCL-0001Fy-OA for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:30 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1B1oSqu000775 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Feb 2010 20:50:29 -0500 Received: from localhost (vpn-10-105.rdu.redhat.com [10.11.10.105]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1B1oRAY027748; Wed, 10 Feb 2010 20:50:28 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 10 Feb 2010 23:49:52 -0200 Message-Id: <1265853007-27300-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> References: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 06/21] Monitor: Convert do_block_set_passwd() to cmd_new_ret() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Luiz Capitulino --- monitor.c | 7 +++++-- qemu-monitor.hx | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 598dbfe..0ae408a 100644 --- a/monitor.c +++ b/monitor.c @@ -1006,7 +1006,7 @@ static int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) return eject_device(mon, bs, force); } -static void do_block_set_passwd(Monitor *mon, const QDict *qdict, +static int do_block_set_passwd(Monitor *mon, const QDict *qdict, QObject **ret_data) { BlockDriverState *bs; @@ -1014,12 +1014,15 @@ static void do_block_set_passwd(Monitor *mon, const QDict *qdict, bs = bdrv_find(qdict_get_str(qdict, "device")); if (!bs) { qemu_error_new(QERR_DEVICE_NOT_FOUND, qdict_get_str(qdict, "device")); - return; + return -1; } if (bdrv_set_key(bs, qdict_get_str(qdict, "password")) < 0) { qemu_error_new(QERR_INVALID_PASSWORD); + return -1; } + + return 0; } static void do_change_block(Monitor *mon, const char *device, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 835fd05..d2be5c4 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1117,7 +1117,7 @@ ETEXI .params = "block_passwd device password", .help = "set the password of encrypted block devices", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_block_set_passwd, + .cmd_new_ret = do_block_set_passwd, }, STEXI