[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 02/11] qemu-img/qemu-io: don't prompt for passwor
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v6 02/11] qemu-img/qemu-io: don't prompt for passwords if not required |
Date: |
Mon, 21 Mar 2016 14:11:43 +0000 |
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 <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
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) {
--
2.5.0
- [Qemu-devel] [PATCH v6 00/11] Add new LUKS block driver (for 2.6), Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 04/11] tests: refactor python I/O tests helper main method, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 03/11] tests: redirect stderr to stdout for iotests, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 05/11] tests: add output filter to python I/O tests helper, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 01/11] block: add flag to indicate that no I/O will be performed, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 02/11] qemu-img/qemu-io: don't prompt for passwords if not required,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v6 08/11] block: add support for --image-opts in block I/O tests, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 06/11] block: add generic full disk encryption driver, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 07/11] block: move encryption deprecation warning into qcow code, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 09/11] block: add support for encryption secrets in block I/O tests, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 10/11] block: enable testing of LUKS driver with block I/O tests, Daniel P. Berrange, 2016/03/21