From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LfMYd-0008D2-6D
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LfMYc-0008Ce-FI
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:50 -0500
Received: from [199.232.76.173] (port=43407 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LfMYc-0008CZ-AP
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:50 -0500
Received: from savannah.gnu.org ([199.232.41.3]:59797 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 1LfMYb-0005Z2-Jt
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:49 -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 1LfMYb-0000la-5h
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 23:00:49 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LfMYa-0000l1-Ss
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 23:00:49 +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: <E1LfMYa-0000l1-Ss@cvs.savannah.gnu.org>
Date: Thu, 05 Mar 2009 23:00:48 +0000
Subject: [Qemu-devel] [6704] block: Introduce bdrv_get_encrypted_filename
	(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: 6704
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6704
Author:   aliguori
Date:     2009-03-05 23:00:48 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
block: Introduce bdrv_get_encrypted_filename (Jan Kiszka)

Introduce bdrv_get_encrypted_filename service to allow more informative
password prompting.

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

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

Modified: trunk/block.c
===================================================================
--- trunk/block.c	2009-03-05 23:00:43 UTC (rev 6703)
+++ trunk/block.c	2009-03-05 23:00:48 UTC (rev 6704)
@@ -1134,6 +1134,16 @@
     }
 }
 
+const char *bdrv_get_encrypted_filename(BlockDriverState *bs)
+{
+    if (bs->backing_hd && bs->backing_hd->encrypted)
+        return bs->backing_file;
+    else if (bs->encrypted)
+        return bs->filename;
+    else
+        return NULL;
+}
+
 void bdrv_get_backing_filename(BlockDriverState *bs,
                                char *filename, int filename_size)
 {

Modified: trunk/block.h
===================================================================
--- trunk/block.h	2009-03-05 23:00:43 UTC (rev 6703)
+++ trunk/block.h	2009-03-05 23:00:48 UTC (rev 6704)
@@ -152,6 +152,7 @@
                           const uint8_t *buf, int nb_sectors);
 int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
 
+const char *bdrv_get_encrypted_filename(BlockDriverState *bs);
 void bdrv_get_backing_filename(BlockDriverState *bs,
                                char *filename, int filename_size);
 int bdrv_snapshot_create(BlockDriverState *bs,