From 2e1e2d264951caa2bbe44e6f58b14c5e4e829661 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Mon, 21 Feb 2011 09:47:37 -0300
Subject: [PATCH 3/8] block: Introduce bdrv_get_encrypted_filename (Jan Kiszka)

RH-Author: Markus Armbruster <armbru@redhat.com>
Message-id: <1298281662-2327-4-git-send-email-armbru@redhat.com>
Patchwork-id: 18534
O-Subject: [PATCH RHEL5.7 qemu-kvm 3/8] block: Introduce
	bdrv_get_encrypted_filename (Jan Kiszka)
Bugzilla: 644706
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
RH-Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>

From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>

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>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6704 c046a42c-6fe2-441c-8c8c-71466251a162
Manually cherry-picked from commit 045df33021d11bba6ed6a9caec37f68d0c615ca1
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu/block.c |   10 ++++++++++
 qemu/block.h |    1 +
 2 files changed, 11 insertions(+), 0 deletions(-)

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qemu/block.c |   10 ++++++++++
 qemu/block.h |    1 +
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/qemu/block.c b/qemu/block.c
index 7b8342c..6b4842b 100644
--- a/qemu/block.c
+++ b/qemu/block.c
@@ -1416,6 +1416,16 @@ void bdrv_info_stats (void)
     }
 }
 
+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)
 {
diff --git a/qemu/block.h b/qemu/block.h
index 4227820..f9050d8 100644
--- a/qemu/block.h
+++ b/qemu/block.h
@@ -166,6 +166,7 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,
                           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,
-- 
1.7.4.rc1.16.gd2f15e