Ask password when encrypted disk image is used (Laurent Vivier)

This patch repairs the management of encrypted disk images and allows to
enter the password.

Changelog:
v2:
- move read_password() before do_loadvm()
- really start monitor if output is stdio.

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@4976 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 1 insertions, 7 deletions

diff --git a/monitor.c b/monitor.c
index fc135ca..10562d5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -76,8 +76,6 @@ static term_cmd_t info_cmds[];
 static uint8_t term_outbuf[1024];
 static int term_outbuf_index;
 
-static void monitor_start_input(void);
-
 CPUState *mon_cpu = NULL;
 
 void term_flush(void)
@@ -2659,15 +2657,13 @@ static void term_read(void *opaque, const uint8_t *buf, int size)
         readline_handle_byte(buf[i]);
 }
 
-static void monitor_start_input(void);
-
 static void monitor_handle_command1(void *opaque, const char *cmdline)
 {
     monitor_handle_command(cmdline);
     monitor_start_input();
 }
 
-static void monitor_start_input(void)
+void monitor_start_input(void)
 {
     readline_start("(qemu) ", 0, monitor_handle_command1, NULL);
 }
@@ -2708,8 +2704,6 @@ void monitor_init(CharDriverState *hd, int show_banner)
     hide_banner = !show_banner;
 
     qemu_chr_add_handlers(hd, term_can_read, term_read, term_event, NULL);
-
-    readline_start("", 0, monitor_handle_command1, NULL);
 }
 
 /* XXX: use threads ? */