commit bc0129d97804615fbcf3281fe30361ab8aa8f4ab
author aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Aug 01 15:12:34 2008 +0000
committer aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Aug 01 15:12:34 2008 +0000
tree 4a95887937dbaa33886e0cc42058bffec4c302d3
parent e94f3a609eb96471af2e4122ddfa1384b93b4ba8

Set focus to monitor to ask password if line is	multiplexed (Laurent Vivier)

This patch allows to display the "Password:" prompt if we use encrypted
disk with "-nographic" option.

It also modifies management of "-nographic" to not override user's
choices for "-serial", "-parallel" and "-monitor".

When qemu has to ask a password with "-nographic" with a multiplexed
serial interface, it forces the focus to the monitor and restore
original focus after.

Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4979 c046a42c-6fe2-441c-8c8c-71466251a162

vl.c

diff --git a/vl.c b/vl.c
index 746742e..03cd386 100644
--- a/vl.c
+++ b/vl.c
@@ -8381,9 +8381,6 @@
                 }
                 break;
             case QEMU_OPTION_nographic:
-                serial_devices[0] = "stdio";
-                parallel_devices[0] = "null";
-                monitor_device = "stdio";
                 nographic = 1;
                 break;
 #ifdef CONFIG_CURSES
@@ -8781,6 +8778,15 @@
         }
     }
 
+    if (nographic) {
+       if (serial_device_index == 0)
+           serial_devices[0] = "stdio";
+       if (parallel_device_index == 0)
+           parallel_devices[0] = "null";
+       if (strncmp(monitor_device, "vc", 2) == 0)
+           monitor_device = "stdio";
+    }
+
 #ifndef _WIN32
     if (daemonize) {
 	pid_t pid;