From patchwork Mon Dec 7 20:37:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 40542 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 E8B66B6F16 for ; Tue, 8 Dec 2009 08:24:11 +1100 (EST) Received: from localhost ([127.0.0.1]:53418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHl3w-0008Vf-Tr for incoming@patchwork.ozlabs.org; Mon, 07 Dec 2009 16:24:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHkL1-00036I-As for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHkKn-0002yk-Re for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:33 -0500 Received: from [199.232.76.173] (port=46529 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHkKn-0002yQ-6v for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:29 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:47588) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NHkKm-0001T1-6X for qemu-devel@nongnu.org; Mon, 07 Dec 2009 15:37:28 -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 424E3276D61 for ; Mon, 7 Dec 2009 21:37:22 +0100 (CET) Received: by crossbow.pond.sub.org (Postfix, from userid 500) id C23A720BE4; Mon, 7 Dec 2009 21:37:16 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 7 Dec 2009 21:37:01 +0100 Message-Id: <1260218236-22143-4-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 03/18] monitor: Fix double-prompt after "change vnc passwd BLA" 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: Markus Armbruster --- monitor.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 50c616d..b9d3d92 100644 --- a/monitor.c +++ b/monitor.c @@ -845,12 +845,17 @@ static void do_change_block(Monitor *mon, const char *device, monitor_read_bdrv_key_start(mon, bs, NULL, NULL); } -static void change_vnc_password_cb(Monitor *mon, const char *password, - void *opaque) +static void change_vnc_password(Monitor *mon, const char *password) { if (vnc_display_password(NULL, password) < 0) monitor_printf(mon, "could not set VNC server password\n"); +} + +static void change_vnc_password_cb(Monitor *mon, const char *password, + void *opaque) +{ + change_vnc_password(mon, password); monitor_read_command(mon, 1); } @@ -862,7 +867,7 @@ static void do_change_vnc(Monitor *mon, const char *target, const char *arg) char password[9]; strncpy(password, arg, sizeof(password)); password[sizeof(password) - 1] = '\0'; - change_vnc_password_cb(mon, password, NULL); + change_vnc_password(mon, password); } else { monitor_read_password(mon, change_vnc_password_cb, NULL); }