From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LfMYm-0008HF-1f
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:01:00 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LfMYl-0008Gm-5h
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:59 -0500
Received: from [199.232.76.173] (port=43412 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LfMYk-0008Gh-UI
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:58 -0500
Received: from savannah.gnu.org ([199.232.41.3]:59803 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LfMYk-0005a0-Gd
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:58 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LfMYj-00011s-V4
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 23:00:58 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LfMYj-00011J-Lf
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 23:00:57 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LfMYj-00011J-Lf@cvs.savannah.gnu.org>
Date: Thu, 05 Mar 2009 23:00:57 +0000
Subject: [Qemu-devel] [6706] monitor: Report encrypted disks in snapshot
	mode (Jan Kiszka)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6706
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6706
Author:   aliguori
Date:     2009-03-05 23:00:57 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
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>

Modified Paths:
--------------
    trunk/block.c

Modified: trunk/block.c
===================================================================
--- trunk/block.c	2009-03-05 23:00:53 UTC (rev 6705)
+++ trunk/block.c	2009-03-05 23:00:57 UTC (rev 6706)
@@ -1101,8 +1101,7 @@
 	    }
             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]");
         }