dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame 0167-Don-t-require-encryption-password-for-qemu-img-info-.patch

5544c1
From 4812a358ff2d7442c33a517a6c80d7d3c301ec56 Mon Sep 17 00:00:00 2001
5544c1
From: "Daniel P. Berrange" <berrange@redhat.com>
5544c1
Date: Mon, 10 Sep 2012 12:11:31 +0100
5544c1
Subject: [PATCH] Don't require encryption password for 'qemu-img info'
5544c1
 command
5544c1
5544c1
The encryption password is only required if I/O is going to be
5544c1
performed on a disk image. The 'qemu-img info' command merely
5544c1
reports metadata, so it should not ask for a decryption password
5544c1
5544c1
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
5544c1
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
5544c1
(cherry picked from commit f0536bb848ad6eb2709a7dc675f261bd160c751b)
5544c1
5544c1
Conflicts:
5544c1
5544c1
	qemu-img.c
5544c1
5544c1
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
5544c1
---
5544c1
 qemu-img.c | 21 +++++++++++----------
5544c1
 1 file changed, 11 insertions(+), 10 deletions(-)
5544c1
5544c1
diff --git a/qemu-img.c b/qemu-img.c
5544c1
index b41e670..0d208e8 100644
5544c1
--- a/qemu-img.c
5544c1
+++ b/qemu-img.c
5544c1
@@ -221,7 +221,8 @@ static int print_block_option_help(const char *filename, const char *fmt)
5544c1
 
5544c1
 static BlockDriverState *bdrv_new_open(const char *filename,
5544c1
                                        const char *fmt,
5544c1
-                                       int flags)
5544c1
+                                       int flags,
5544c1
+                                       bool require_io)
5544c1
 {
5544c1
     BlockDriverState *bs;
5544c1
     BlockDriver *drv;
5544c1
@@ -246,7 +247,7 @@ static BlockDriverState *bdrv_new_open(const char *filename,
5544c1
         goto fail;
5544c1
     }
5544c1
 
5544c1
-    if (bdrv_is_encrypted(bs)) {
5544c1
+    if (bdrv_is_encrypted(bs) && require_io) {
5544c1
         printf("Disk image '%s' is encrypted.\n", filename);
5544c1
         if (read_password(password, sizeof(password)) < 0) {
5544c1
             error_report("No password given");
5544c1
@@ -413,7 +414,7 @@ static int img_check(int argc, char **argv)
5544c1
     }
5544c1
     filename = argv[optind++];
5544c1
 
5544c1
-    bs = bdrv_new_open(filename, fmt, flags);
5544c1
+    bs = bdrv_new_open(filename, fmt, flags, true);
5544c1
     if (!bs) {
5544c1
         return 1;
5544c1
     }
5544c1
@@ -520,7 +521,7 @@ static int img_commit(int argc, char **argv)
5544c1
         return -1;
5544c1
     }
5544c1
 
5544c1
-    bs = bdrv_new_open(filename, fmt, flags);
5544c1
+    bs = bdrv_new_open(filename, fmt, flags, true);
5544c1
     if (!bs) {
5544c1
         return 1;
5544c1
     }
5544c1
@@ -762,7 +763,7 @@ static int img_convert(int argc, char **argv)
5544c1
 
5544c1
     total_sectors = 0;
5544c1
     for (bs_i = 0; bs_i < bs_n; bs_i++) {
5544c1
-        bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt, BDRV_O_FLAGS);
5544c1
+        bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt, BDRV_O_FLAGS, true);
5544c1
         if (!bs[bs_i]) {
5544c1
             error_report("Could not open '%s'", argv[optind + bs_i]);
5544c1
             ret = -1;
5544c1
@@ -881,7 +882,7 @@ static int img_convert(int argc, char **argv)
5544c1
         return -1;
5544c1
     }
5544c1
 
5544c1
-    out_bs = bdrv_new_open(out_filename, out_fmt, flags);
5544c1
+    out_bs = bdrv_new_open(out_filename, out_fmt, flags, true);
5544c1
     if (!out_bs) {
5544c1
         ret = -1;
5544c1
         goto out;
5544c1
@@ -1135,7 +1136,7 @@ static int img_info(int argc, char **argv)
5544c1
     }
5544c1
     filename = argv[optind++];
5544c1
 
5544c1
-    bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_NO_BACKING);
5544c1
+    bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_NO_BACKING, false);
5544c1
     if (!bs) {
5544c1
         return 1;
5544c1
     }
5544c1
@@ -1248,7 +1249,7 @@ static int img_snapshot(int argc, char **argv)
5544c1
     filename = argv[optind++];
5544c1
 
5544c1
     /* Open the image */
5544c1
-    bs = bdrv_new_open(filename, NULL, bdrv_oflags);
5544c1
+    bs = bdrv_new_open(filename, NULL, bdrv_oflags, true);
5544c1
     if (!bs) {
5544c1
         return 1;
5544c1
     }
5544c1
@@ -1366,7 +1367,7 @@ static int img_rebase(int argc, char **argv)
5544c1
      * Ignore the old backing file for unsafe rebase in case we want to correct
5544c1
      * the reference to a renamed or moved backing file.
5544c1
      */
5544c1
-    bs = bdrv_new_open(filename, fmt, flags);
5544c1
+    bs = bdrv_new_open(filename, fmt, flags, true);
5544c1
     if (!bs) {
5544c1
         return 1;
5544c1
     }
5544c1
@@ -1639,7 +1640,7 @@ static int img_resize(int argc, char **argv)
5544c1
     n = qemu_opt_get_size(param, BLOCK_OPT_SIZE, 0);
5544c1
     qemu_opts_del(param);
5544c1
 
5544c1
-    bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR);
5544c1
+    bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR, true);
5544c1
     if (!bs) {
5544c1
         ret = -1;
5544c1
         goto out;
5544c1
-- 
5544c1
1.7.12.1
5544c1