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-io.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-io.c')
| -rw-r--r-- | qemu-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |