aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-03-21 14:11:43 +0000
committerKevin Wolf <kwolf@redhat.com>2016-03-30 11:59:32 +0200
commit4ef130fca87b7a8c77e1af9ca967f28b683811d7 (patch)
treed44f5d9c74f1684087c0c043ab322c27c5d76ee9
parentabb06c5ac1c86e747bbe08bf7b5b69723ad69832 (diff)
qemu-img/qemu-io: don't prompt for passwords if not required
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>
-rw-r--r--qemu-img.c3
-rw-r--r--qemu-io.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/qemu-img.c b/qemu-img.c
index 9e3ac9c1a8..c57898ee51 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -231,7 +231,8 @@ static int img_open_password(BlockBackend *blk, const char *filename,
char password[256];
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);
if (qemu_read_password(password, sizeof(password)) < 0) {
error_report("No password given");
diff --git a/qemu-io.c b/qemu-io.c
index bc129536e4..c08b495a05 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -70,7 +70,7 @@ static int openfile(char *name, int flags, QDict *opts)
}
bs = blk_bs(qemuio_blk);
- if (bdrv_is_encrypted(bs)) {
+ if (bdrv_is_encrypted(bs) && bdrv_key_required(bs)) {
char password[256];
printf("Disk image '%s' is encrypted.\n", name);
if (qemu_read_password(password, sizeof(password)) < 0) {