OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-img/qemu-io: don't prompt for passwords if not required

Browse Source 
The qemu-img/qemu-io tools prompt for disk encryption passwords
regardless of whether any are actually required. Adding a check
on bdrv_key_required() avoids this prompt for disk formats which
have been converted to the QCryptoSecret APIs.

This is just a temporary hack to ensure the block I/O tests
continue to work after each patch, since the last patch will
completely delete all the password prompting code.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-03-21 14:11:43 +00:00 committed by Kevin Wolf
parent abb06c5ac1
commit 4ef130fca8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qemu-img.c
View File

@ -231,7 +231,8 @@ static int img_open_password(BlockBackend *blk, const char *filename,
char password[256]; char password[256];
bs = blk_bs(blk); bs = blk_bs(blk);
if (bdrv_is_encrypted(bs) && !(flags & BDRV_O_NO_IO)) { if (bdrv_is_encrypted(bs) && bdrv_key_required(bs) &&
!(flags & BDRV_O_NO_IO)) {
qprintf(quiet, "Disk image '%s' is encrypted.\n", filename); qprintf(quiet, "Disk image '%s' is encrypted.\n", filename);
if (qemu_read_password(password, sizeof(password)) < 0) { if (qemu_read_password(password, sizeof(password)) < 0) {
error_report("No password given"); error_report("No password given");

2
qemu-io.c
View File

@ -70,7 +70,7 @@ static int openfile(char *name, int flags, QDict *opts)
} }
bs = blk_bs(qemuio_blk); bs = blk_bs(qemuio_blk);
if (bdrv_is_encrypted(bs)) { if (bdrv_is_encrypted(bs) && bdrv_key_required(bs)) {
char password[256]; char password[256];
printf("Disk image '%s' is encrypted.\n", name); printf("Disk image '%s' is encrypted.\n", name);
if (qemu_read_password(password, sizeof(password)) < 0) { if (qemu_read_password(password, sizeof(password)) < 0) {