From patchwork Mon Dec 7 20:37:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 40544 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 63420B6F1C for ; Tue, 8 Dec 2009 08:30:38 +1100 (EST) Received: from localhost ([127.0.0.1]:58641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHlAB-0004R7-8z for incoming@patchwork.ozlabs.org; Mon, 07 Dec 2009 16:30:35 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHkL4-00038K-SN for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:46 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHkKt-000325-1r for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:40 -0500 Received: from [199.232.76.173] (port=46539 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHkKr-00031o-Nv for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:33 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:47599) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NHkKr-0001Tm-0B for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:33 -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 464D5276D58 for ; Mon, 7 Dec 2009 21:37:27 +0100 (CET) Received: by crossbow.pond.sub.org (Postfix, from userid 500) id AB98C20BE3; Mon, 7 Dec 2009 21:37:16 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 7 Dec 2009 21:37:00 +0100 Message-Id: <1260218236-22143-3-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1260218236-22143-1-git-send-email-armbru@redhat.com> References: <1260218236-22143-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [FOR 0.12 PATCH 02/18] monitor: do_cont(): Don't ask for passwords 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 From: Luiz Capitulino The do_cont() function will ask the user to enter a password if a device is encrypted. This is invalid under QMP, so we raise a QERR_DEVICE_ENCRYPTED error. Signed-off-by: Luiz Capitulino Signed-off-by: Markus Armbruster --- monitor.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index 0ff208e..50c616d 100644 --- a/monitor.c +++ b/monitor.c @@ -148,7 +148,10 @@ static void monitor_read_command(Monitor *mon, int show_prompt) static int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func, void *opaque) { - if (mon->rs) { + if (monitor_ctrl_mode(mon)) { + qemu_error_new(QERR_MISSING_PARAMETER, "password"); + return -EINVAL; + } else if (mon->rs) { readline_start(mon->rs, "Password: ", 1, readline_func, opaque); /* prompt is printed on return from the command handler */ return 0; @@ -4188,6 +4191,11 @@ void monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs, return; } + if (monitor_ctrl_mode(mon)) { + qemu_error_new(QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs)); + return; + } + monitor_printf(mon, "%s (%s) is encrypted.\n", bdrv_get_device_name(bs), bdrv_get_encrypted_filename(bs));