diff options
| -rw-r--r-- | qemu-img.c | 3 | ||||
| -rw-r--r-- | qemu-io.c | 2 |
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"); @@ -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) { |