From 4812a358ff2d7442c33a517a6c80d7d3c301ec56 Mon Sep 17 00:00:00 2001

From: "Daniel P. Berrange" <berrange@redhat.com>

Date: Mon, 10 Sep 2012 12:11:31 +0100

Subject: [PATCH] Don't require encryption password for 'qemu-img info'

 command

The encryption password is only required if I/O is going to be

performed on a disk image. The 'qemu-img info' command merely

reports metadata, so it should not ask for a decryption password

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit f0536bb848ad6eb2709a7dc675f261bd160c751b)

Conflicts:

	qemu-img.c

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

---

 qemu-img.c | 21 +++++++++++----------

 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c

index b41e670..0d208e8 100644

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -221,7 +221,8 @@ static int print_block_option_help(const char *filename, const char *fmt)

 static BlockDriverState *bdrv_new_open(const char *filename,

                                        const char *fmt,

-                                       int flags)

+                                       int flags,

+                                       bool require_io)

 {

     BlockDriverState *bs;

     BlockDriver *drv;

@@ -246,7 +247,7 @@ static BlockDriverState *bdrv_new_open(const char *filename,

         goto fail;

     }

-    if (bdrv_is_encrypted(bs)) {

+    if (bdrv_is_encrypted(bs) && require_io) {

         printf("Disk image '%s' is encrypted.\n", filename);

         if (read_password(password, sizeof(password)) < 0) {

             error_report("No password given");

@@ -413,7 +414,7 @@ static int img_check(int argc, char **argv)

     }

     filename = argv[optind++];

-    bs = bdrv_new_open(filename, fmt, flags);

+    bs = bdrv_new_open(filename, fmt, flags, true);

     if (!bs) {

         return 1;

     }

@@ -520,7 +521,7 @@ static int img_commit(int argc, char **argv)

         return -1;

     }

-    bs = bdrv_new_open(filename, fmt, flags);

+    bs = bdrv_new_open(filename, fmt, flags, true);

     if (!bs) {

         return 1;

     }

@@ -762,7 +763,7 @@ static int img_convert(int argc, char **argv)

     total_sectors = 0;

     for (bs_i = 0; bs_i < bs_n; bs_i++) {

-        bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt, BDRV_O_FLAGS);

+        bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt, BDRV_O_FLAGS, true);

         if (!bs[bs_i]) {

             error_report("Could not open '%s'", argv[optind + bs_i]);

             ret = -1;

@@ -881,7 +882,7 @@ static int img_convert(int argc, char **argv)

         return -1;

     }

-    out_bs = bdrv_new_open(out_filename, out_fmt, flags);

+    out_bs = bdrv_new_open(out_filename, out_fmt, flags, true);

     if (!out_bs) {

         ret = -1;

         goto out;

@@ -1135,7 +1136,7 @@ static int img_info(int argc, char **argv)

     }

     filename = argv[optind++];

-    bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_NO_BACKING);

+    bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_NO_BACKING, false);

     if (!bs) {

         return 1;

     }

@@ -1248,7 +1249,7 @@ static int img_snapshot(int argc, char **argv)

     filename = argv[optind++];

     /* Open the image */

-    bs = bdrv_new_open(filename, NULL, bdrv_oflags);

+    bs = bdrv_new_open(filename, NULL, bdrv_oflags, true);

     if (!bs) {

         return 1;

     }

@@ -1366,7 +1367,7 @@ static int img_rebase(int argc, char **argv)

      * Ignore the old backing file for unsafe rebase in case we want to correct

      * the reference to a renamed or moved backing file.

      */

-    bs = bdrv_new_open(filename, fmt, flags);

+    bs = bdrv_new_open(filename, fmt, flags, true);

     if (!bs) {

         return 1;

     }

@@ -1639,7 +1640,7 @@ static int img_resize(int argc, char **argv)

     n = qemu_opt_get_size(param, BLOCK_OPT_SIZE, 0);

     qemu_opts_del(param);

-    bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR);

+    bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR, true);

     if (!bs) {

         ret = -1;

         goto out;

-- 

1.7.12.1