| Message ID | 1453311539-1193-10-git-send-email-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 01/20/2016 10:38 AM, Daniel P. Berrange wrote: > 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. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > qemu-img.c | 3 ++- > qemu-io.c | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/qemu-img.c b/qemu-img.c index e79f29b..faf4dbd 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -287,7 +287,8 @@ static BlockBackend *img_open_file(const char *id, const char *filename, } 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 1c20e9b..98b5cc2 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -72,7 +72,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) {
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. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- qemu-img.c | 3 ++- qemu-io.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)