From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LVrrK-0004qI-QA for qemu-devel@nongnu.org; Sat, 07 Feb 2009 13:24:54 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LVrrJ-0004pT-1v for qemu-devel@nongnu.org; Sat, 07 Feb 2009 13:24:53 -0500 Received: from [199.232.76.173] (port=55934 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LVrrI-0004p2-Ow for qemu-devel@nongnu.org; Sat, 07 Feb 2009 13:24:52 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:46783) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LVrrH-0007OS-T6 for qemu-devel@nongnu.org; Sat, 07 Feb 2009 13:24:52 -0500 Received: from smtp06.web.de (fmsmtp06.dlan.cinetic.de [172.20.5.172]) by fmmailgate01.web.de (Postfix) with ESMTP id 06A0AFCE9BD3 for ; Sat, 7 Feb 2009 19:24:51 +0100 (CET) Received: from [88.65.43.151] (helo=[192.168.1.198]) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #277) id 1LVrrG-0003hE-00 for qemu-devel@nongnu.org; Sat, 07 Feb 2009 19:24:50 +0100 Resent-To: qemu-devel Resent-Message-Id: <498DD1F3.4090803@web.de> From: Jan Kiszka Date: Sat, 07 Feb 2009 19:16:28 +0100 Message-ID: <20090207181628.13667.81811.stgit@mchn012c.ww002.siemens.net> In-Reply-To: <20090207181627.13667.9979.stgit@mchn012c.ww002.siemens.net> References: <20090207181627.13667.9979.stgit@mchn012c.ww002.siemens.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH 03/17] block: Introduce bdrv_get_encrypted_filename Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Introduce bdrv_get_encrypted_filename service to allow more informative password prompting. Signed-off-by: Jan Kiszka --- block.c | 10 ++++++++++ block.h | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index d12a9aa..78982f4 100644 --- a/block.c +++ b/block.c @@ -1089,6 +1089,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/block.h b/block.h index aa26ef3..a01fa31 100644 --- a/block.h +++ b/block.h @@ -152,6 +152,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,