qemu-img/qemu-io: don't prompt for passwords if not required
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 21 Mar 2016 14:11:43 +0000 (14:11 +0000)
committerKevin Wolf <kwolf@redhat.com>
Wed, 30 Mar 2016 09:59:32 +0000 (11:59 +0200)
commit4ef130fca87b7a8c77e1af9ca967f28b683811d7
treed44f5d9c74f1684087c0c043ab322c27c5d76ee9
parentabb06c5ac1c86e747bbe08bf7b5b69723ad69832
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>
qemu-img.c
qemu-io.c