From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvH4-00036f-8L for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:09:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akvGz-00069z-Ay for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:09:42 -0400 From: Kevin Wolf Date: Tue, 29 Mar 2016 17:08:14 +0200 Message-Id: <1459264128-12761-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1459264128-12761-1-git-send-email-kwolf@redhat.com> References: <1459264128-12761-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 14/48] qemu-img/qemu-io: don't prompt for passwords if not required List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: "Daniel P. Berrange" 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 Signed-off-by: Daniel P. Berrange Signed-off-by: Kevin Wolf --- qemu-img.c | 3 ++- qemu-io.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 7fa2a13..681cb70 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -230,7 +230,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"); diff --git a/qemu-io.c b/qemu-io.c index d7c2f26..1bd1158 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -69,7 +69,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) { -- 1.8.3.1