[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] drive_init: Don't try to read passwords before
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 2/9] drive_init: Don't try to read passwords before monitor setup |
Date: |
Fri, 6 Feb 2009 19:08:53 -0200 |
drive_init() calls qemu_key_check(), but it doesn't make sense to call
it before the monitor was set up. This makes qemu hang forever waiting
for a password on a monitor that doesn't exist.
Removing that call will make the password to be read at a proper time,
at read_passwords().
Signed-off-by: Eduardo Habkost <address@hidden>
---
vl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/vl.c b/vl.c
index aff2b2c..d3ec724 100644
--- a/vl.c
+++ b/vl.c
@@ -2548,7 +2548,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
bdrv_flags |= BDRV_O_CACHE_WB;
else if (cache == 3) /* not specified */
bdrv_flags |= BDRV_O_CACHE_DEF;
- 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;
--
1.6.0.2.GIT
- [Qemu-devel] [PATCH 0/9] encryption code changes, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 6/9] vnc: make DES-challenge authentication (aka "VNC auth") optional, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 2/9] drive_init: Don't try to read passwords before monitor setup,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 7/9] configure: add check for libgcrypt, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 4/9] qcow: define QCOW_CRYPT_MAX, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 3/9] monitor_readline: poll pending bottom halves before readline_start(), Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 5/9] qcow: make encryption support optional, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 1/9] vnc: abort on unknown options, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 8/9] qcow: use libgcrypt AES implementation, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 9/9] vnc: use libgcrypt for DES-challenge authentication, Eduardo Habkost, 2009/02/06
- [Qemu-devel] Re: [PATCH 0/9] encryption code changes, Jan Kiszka, 2009/02/06
- Re: [Qemu-devel] [PATCH 0/9] encryption code changes, Anthony Liguori, 2009/02/06