From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KaRKw-0007fj-4E for qemu-devel@nongnu.org; Tue, 02 Sep 2008 04:34:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KaRKu-0007ex-IR for qemu-devel@nongnu.org; Tue, 02 Sep 2008 04:34:05 -0400 Received: from [199.232.76.173] (port=38106 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KaRKt-0007eZ-Q9 for qemu-devel@nongnu.org; Tue, 02 Sep 2008 04:34:04 -0400 Received: from ecfrec.frec.bull.fr ([129.183.4.8]:59910) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KaRKt-0002tF-5d for qemu-devel@nongnu.org; Tue, 02 Sep 2008 04:34:03 -0400 Received: from localhost (localhost [127.0.0.1]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id B856119D9E2 for ; Tue, 2 Sep 2008 10:33:24 +0200 (CEST) Received: from ecfrec.frec.bull.fr ([127.0.0.1]) by localhost (ecfrec.frec.bull.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23248-02 for ; Tue, 2 Sep 2008 10:33:22 +0200 (CEST) Received: from cyclope.frec.bull.fr (cyclope.frec.bull.fr [129.183.4.9]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id EBE6E19D9E0 for ; Tue, 2 Sep 2008 10:33:21 +0200 (CEST) Received: from [129.183.101.63] (frecb007144.frec.bull.fr [129.183.101.63]) by cyclope.frec.bull.fr (Postfix) with ESMTP id 020DE2728D for ; Tue, 2 Sep 2008 10:33:20 +0200 (CEST) From: Laurent Vivier Content-Type: text/plain Date: Tue, 02 Sep 2008 10:33:27 +0200 Message-Id: <1220344407.4174.4.camel@frecb07144> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Correct the password prompt management. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "qemu-devel@nongnu.org" This patch allows to provide a password for encrypted disks by moving the password prompt after the monitor initialisation and by removing the explicit start of the monitor command input. The start of the command input is triggered by the term event CHR_EVENT_RESET. Moreover, during a password read, the term event CHR_EVENT_RESET is ignored to avoid a reset to the command prompt and delayed after the end of password input. Signed-off-by: Laurent Vivier --- monitor.c | 17 ++++++++++++++++- vl.c | 19 ++++++------------- 2 files changed, 22 insertions(+), 14 deletions(-) Index: qemu/monitor.c =================================================================== --- qemu.orig/monitor.c 2008-09-02 09:46:53.000000000 +0200 +++ qemu/monitor.c 2008-09-02 10:14:38.000000000 +0200 @@ -69,6 +69,8 @@ typedef struct term_cmd_t { #define MAX_MON 4 static CharDriverState *monitor_hd[MAX_MON]; static int hide_banner; +static int read_password; +static int need_reset; static term_cmd_t term_cmds[]; static term_cmd_t info_cmds[]; @@ -2703,6 +2705,11 @@ static void term_event(void *opaque, int if (event != CHR_EVENT_RESET) return; + if (read_password) { /* ignore reset when reading password */ + need_reset = 1; + return; + } + if (!hide_banner) term_printf("QEMU %s monitor - type 'help' for more information \n", QEMU_VERSION); @@ -2735,7 +2742,8 @@ void monitor_init(CharDriverState *hd, i qemu_chr_add_handlers(hd, term_can_read, term_read, term_event, NULL); - readline_start("", 0, monitor_handle_command1, NULL); + read_password = 0; + need_reset = 0; } /* XXX: use threads ? */ @@ -2756,6 +2764,8 @@ void monitor_readline(const char *prompt int i; int old_focus[MAX_MON]; + read_password = is_password; + if (is_password) { for (i = 0; i < MAX_MON; i++) { old_focus[i] = 0; @@ -2779,5 +2789,10 @@ void monitor_readline(const char *prompt for (i = 0; i < MAX_MON; i++) if (old_focus[i]) monitor_hd[i]->focus = old_focus[i]; + read_password = 0; + if (need_reset) { + term_event(NULL, CHR_EVENT_RESET); + need_reset = 0; + } } } Index: qemu/vl.c =================================================================== --- qemu.orig/vl.c 2008-09-02 09:46:53.000000000 +0200 +++ qemu/vl.c 2008-09-02 10:04:38.000000000 +0200 @@ -5737,7 +5737,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; @@ -8040,22 +8040,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)); } } @@ -9199,12 +9191,13 @@ int main(int argc, char **argv) } #endif + read_passwords(); + if (loadvm) do_loadvm(loadvm); { /* XXX: simplify init */ - read_passwords(); if (autostart) { vm_start(); }