From bc0129d97804615fbcf3281fe30361ab8aa8f4ab Mon Sep 17 00:00:00 2001 From: aliguori Date: Fri, 1 Aug 2008 15:12:34 +0000 Subject: 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4979 c046a42c-6fe2-441c-8c8c-71466251a162 --- vl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index 746742e703..03cd386906 100644 --- a/vl.c +++ b/vl.c @@ -8381,9 +8381,6 @@ int main(int argc, char **argv) } 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 @@ int main(int argc, char **argv) } } + 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; -- cgit v1.2.3