motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ask password when encrypted disk image is used (Laurent Vivier)

Browse source 
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 <Laurent.Vivier@bull.net>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4976 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-08-01 14:51:02 +00:00
parent ccf21c31fa
commit 396f929762
3 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
vl.c
View file

@ -5687,7 +5687,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
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, const char *name)
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();
}