gwj / at91sam9263 · Commits

Commit 045df33021d11bba6ed6a9caec37f68d0c615ca1

Authored by aliguori
1 parent 51de9760

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>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6704 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 11 additions and 0 deletions
@@ -1134,6 +1134,16 @@ void bdrv_info_stats (void) @@ -1134,6 +1134,16 @@ void bdrv_info_stats (void)
1134 } 1134 }
1135 } 1135 }
1136 1136
  1137 +const char *bdrv_get_encrypted_filename(BlockDriverState *bs)
  1138 +{
  1139 + if (bs->backing_hd && bs->backing_hd->encrypted)
  1140 + return bs->backing_file;
  1141 + else if (bs->encrypted)
  1142 + return bs->filename;
  1143 + else
  1144 + return NULL;
  1145 +}
  1146 +
1137 void bdrv_get_backing_filename(BlockDriverState *bs, 1147 void bdrv_get_backing_filename(BlockDriverState *bs,
1138 char *filename, int filename_size) 1148 char *filename, int filename_size)
1139 { 1149 {
@@ -152,6 +152,7 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num, @@ -152,6 +152,7 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,
152 const uint8_t *buf, int nb_sectors); 152 const uint8_t *buf, int nb_sectors);
153 int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi); 153 int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
154 154
  155 +const char *bdrv_get_encrypted_filename(BlockDriverState *bs);
155 void bdrv_get_backing_filename(BlockDriverState *bs, 156 void bdrv_get_backing_filename(BlockDriverState *bs,
156 char *filename, int filename_size); 157 char *filename, int filename_size);
157 int bdrv_snapshot_create(BlockDriverState *bs, 158 int bdrv_snapshot_create(BlockDriverState *bs,