diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-03-21 14:11:43 +0000 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-30 11:59:32 +0200 |
| commit | 4ef130fca87b7a8c77e1af9ca967f28b683811d7 (patch) | |
| tree | d44f5d9c74f1684087c0c043ab322c27c5d76ee9 /qemu-img.c | |
| parent | abb06c5ac1c86e747bbe08bf7b5b69723ad69832 (diff) | |
| download | focaccia-qemu-4ef130fca87b7a8c77e1af9ca967f28b683811d7.tar.gz focaccia-qemu-4ef130fca87b7a8c77e1af9ca967f28b683811d7.zip | |
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>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 3 |
1 files changed, 2 insertions, 1 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"); |