[prev in list] [next in list] [prev in thread] [next in thread]
List: qemu-devel
Subject: [Qemu-devel] [PATCH][v2] qemu: ask password when encrypted disk
From: Laurent Vivier <Laurent.Vivier () bull ! net>
Date: 2008-07-31 11:19:43
Message-ID: 1217503183.3879.17.camel () frecb07144
[Download RAW message or body]
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.
Laurent
--
----------------- Laurent.Vivier@bull.net ------------------
"La perfection est atteinte non quand il ne reste rien Ã
ajouter mais quand il ne reste rien à enlever." Saint Exupéry
["qemu-encrypted.patch" (qemu-encrypted.patch)]
Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
---
console.h | 1 +
monitor.c | 8 +-------
vl.c | 27 ++++++++++++++-------------
3 files changed, 16 insertions(+), 20 deletions(-)
Index: qemu/console.h
===================================================================
--- qemu.orig/console.h 2008-07-31 12:52:24.000000000 +0200
+++ qemu/console.h 2008-07-31 12:52:26.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-31 12:52:24.000000000 +0200
+++ qemu/monitor.c 2008-07-31 13:05:51.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-31 12:52:24.000000000 +0200
+++ qemu/vl.c 2008-07-31 13:05:51.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));
}
}
@@ -8159,6 +8151,7 @@ int main(int argc, char **argv)
int optind;
const char *r, *optarg;
CharDriverState *monitor_hd;
+ int has_monitor;
const char *monitor_device;
const char *serial_devices[MAX_SERIAL_PORTS];
int serial_device_index;
@@ -9023,6 +9016,8 @@ int main(int argc, char **argv)
}
/* Maintain compatibility with multiple stdio monitors */
+
+ has_monitor = 0;
if (!strcmp(monitor_device,"stdio")) {
for (i = 0; i < MAX_SERIAL_PORTS; i++) {
const char *devname = serial_devices[i];
@@ -9035,6 +9030,7 @@ int main(int argc, char **argv)
break;
}
}
+ has_monitor = 1;
}
if (monitor_device) {
monitor_hd = qemu_chr_open(monitor_device);
@@ -9043,6 +9039,7 @@ int main(int argc, char **argv)
exit(1);
}
monitor_init(monitor_hd, !nographic);
+ has_monitor = 1;
}
for(i = 0; i < MAX_SERIAL_PORTS; i++) {
@@ -9103,12 +9100,16 @@ int main(int argc, char **argv)
}
#endif
+ read_passwords();
+
+ if (has_monitor)
+ monitor_start_input();
+
if (loadvm)
do_loadvm(loadvm);
{
/* XXX: simplify init */
- read_passwords();
if (autostart) {
vm_start();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic