From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LfMYu-0008Iv-Bc
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:01:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LfMYt-0008Ij-Pv
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:01:07 -0500
Received: from [199.232.76.173] (port=43415 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LfMYt-0008Ib-D5
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:01:07 -0500
Received: from savannah.gnu.org ([199.232.41.3]:59807 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LfMYt-0005ak-0T
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:01:07 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LfMYs-0001Io-Hs
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 23:01:06 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LfMYs-0001IC-99
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 23:01:06 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LfMYs-0001IC-99@cvs.savannah.gnu.org>
Date: Thu, 05 Mar 2009 23:01:06 +0000
Subject: [Qemu-devel] [6708] monitor: Simplify password input mode (Jan
	Kiszka)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6708
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6708
Author:   aliguori
Date:     2009-03-05 23:01:05 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
monitor: Simplify password input mode (Jan Kiszka)

Drop the hack to query passwords on all monitor terminals now that they
are requested when the user initially enters 'continue'.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/monitor.c

Modified: trunk/monitor.c
===================================================================
--- trunk/monitor.c	2009-03-05 23:01:01 UTC (rev 6707)
+++ trunk/monitor.c	2009-03-05 23:01:05 UTC (rev 6708)
@@ -2912,20 +2912,6 @@
 static void monitor_readline(const char *prompt, int is_password,
                              char *buf, int buf_size)
 {
-    int i;
-    int old_focus[MAX_MON];
-
-    if (is_password) {
-        for (i = 0; i < MAX_MON; i++) {
-            old_focus[i] = 0;
-            if (monitor_hd[i]) {
-                old_focus[i] = monitor_hd[i]->focus;
-                monitor_hd[i]->focus = 0;
-                qemu_chr_send_event(monitor_hd[i], CHR_EVENT_FOCUS);
-            }
-        }
-    }
-
     readline_start(prompt, is_password, monitor_readline_cb, NULL);
     monitor_readline_buf = buf;
     monitor_readline_buf_size = buf_size;
@@ -2933,12 +2919,6 @@
     while (monitor_readline_started) {
         main_loop_wait(10);
     }
-    /* restore original focus */
-    if (is_password) {
-        for (i = 0; i < MAX_MON; i++)
-            if (old_focus[i])
-                monitor_hd[i]->focus = old_focus[i];
-    }
 }
 
 int monitor_read_bdrv_key(BlockDriverState *bs)