Signed-off-by: Laurent Vivier <address@hidden>
---
 console.h |    1 +
 monitor.c |    8 +-------
 vl.c      |   19 +++++++------------
 3 files changed, 9 insertions(+), 19 deletions(-)

Index: qemu/console.h
===================================================================
--- qemu.orig/console.h	2008-07-30 14:06:23.000000000 +0200
+++ qemu/console.h	2008-07-30 14:08:34.000000000 +0200
@@ -160,6 +160,7 @@ extern uint8_t _translate_keycode(const 
    does not need to include console.h  */
 /* monitor.c */
 void monitor_init(CharDriverState *hd, int show_banner);
+void monitor_start_input(void);
 void term_puts(const char *str);
 void term_vprintf(const char *fmt, va_list ap);
 void term_printf(const char *fmt, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
Index: qemu/monitor.c
===================================================================
--- qemu.orig/monitor.c	2008-07-30 14:06:23.000000000 +0200
+++ qemu/monitor.c	2008-07-30 14:08:34.000000000 +0200
@@ -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, cons
         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, i
     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 ? */
Index: qemu/vl.c
===================================================================
--- qemu.orig/vl.c	2008-07-30 14:06:23.000000000 +0200
+++ qemu/vl.c	2008-07-30 14:14:23.000000000 +0200
@@ -5687,7 +5687,7 @@ static int drive_init(struct drive_opt *
         bdrv_flags |= BDRV_O_SNAPSHOT;
     if (!cache)
         bdrv_flags |= BDRV_O_DIRECT;
-    if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0 || qemu_key_check(bdrv, file)) {
+    if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0) {
         fprintf(stderr, "qemu: could not open disk image %s\n",
                         file);
         return -1;
@@ -7975,22 +7975,14 @@ int qemu_key_check(BlockDriverState *bs,
     return -EPERM;
 }
 
-static BlockDriverState *get_bdrv(int index)
-{
-    if (index > nb_drives)
-        return NULL;
-    return drives_table[index].bdrv;
-}
-
 static void read_passwords(void)
 {
     BlockDriverState *bs;
     int i;
 
-    for(i = 0; i < 6; i++) {
-        bs = get_bdrv(i);
-        if (bs)
-            qemu_key_check(bs, bdrv_get_device_name(bs));
+    for(i = 0; i < nb_drives; i++) {
+        bs = drives_table[i].bdrv;
+        qemu_key_check(bs, bdrv_get_device_name(bs));
     }
 }
 
@@ -9114,6 +9106,9 @@ int main(int argc, char **argv)
         }
     }
 
+    if (monitor_device)
+        monitor_start_input();
+
     if (daemonize) {
 	uint8_t status = 0;
 	ssize_t len;