From 396f929762d10ba2c7b38f7e8a2276dd066be2d7 Mon Sep 17 00:00:00 2001 From: aliguori Date: Fri, 1 Aug 2008 14:51:02 +0000 Subject: 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4976 c046a42c-6fe2-441c-8c8c-71466251a162 --- monitor.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index fc135caf50..10562d52fc 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 ? */ -- cgit v1.2.1