From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 5 Mar 2009 23:00:57 +0000 (+0000)
Subject: monitor: Report encrypted disks in snapshot mode (Jan Kiszka)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=430eb509d2d05bd568c1394213fd12cb447467a7;p=qemu.git

monitor: Report encrypted disks in snapshot mode (Jan Kiszka)

If the backing file is encrypted, 'info block' currently does not report
the disk as encrypted. Fix this by using the standard API to check disk
encryption mode. Moreover, switch to a canonical output format.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6706 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/block.c b/block.c
index e35c9a65aa..5f3f780fbe 100644
--- a/block.c
+++ b/block.c
@@ -1101,8 +1101,7 @@ void bdrv_info(void)
 	    }
             term_printf(" ro=%d", bs->read_only);
             term_printf(" drv=%s", bs->drv->format_name);
-            if (bs->encrypted)
-                term_printf(" encrypted");
+            term_printf(" encrypted=%d", bdrv_is_encrypted(bs));
         } else {
             term_printf(" [not inserted]");
         }