From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LfJSY-0002NS-Dl for qemu-devel@nongnu.org; Thu, 05 Mar 2009 14:42:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LfJSX-0002My-Es for qemu-devel@nongnu.org; Thu, 05 Mar 2009 14:42:22 -0500 Received: from [199.232.76.173] (port=48542 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LfJSX-0002Mo-7Q for qemu-devel@nongnu.org; Thu, 05 Mar 2009 14:42:21 -0500 Received: from savannah.gnu.org ([199.232.41.3]:38614 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 ) id 1LfJSW-0003n8-RY for qemu-devel@nongnu.org; Thu, 05 Mar 2009 14:42:21 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LfJSW-0002VG-8u for qemu-devel@nongnu.org; Thu, 05 Mar 2009 19:42:20 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LfJSW-0002VC-4e for qemu-devel@nongnu.org; Thu, 05 Mar 2009 19:42:20 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Thu, 05 Mar 2009 19:42:20 +0000 Subject: [Qemu-devel] [6696] block: Introduce bdrv_get_encrypted_filename (Jan Kiszka) 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 Revision: 6696 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6696 Author: aliguori Date: 2009-03-05 19:42:19 +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 Signed-off-by: Anthony Liguori Modified Paths: -------------- branches/stable_0_10_0/block.c branches/stable_0_10_0/block.h Modified: branches/stable_0_10_0/block.c =================================================================== --- branches/stable_0_10_0/block.c 2009-03-05 19:42:15 UTC (rev 6695) +++ branches/stable_0_10_0/block.c 2009-03-05 19:42:19 UTC (rev 6696) @@ -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: branches/stable_0_10_0/block.h =================================================================== --- branches/stable_0_10_0/block.h 2009-03-05 19:42:15 UTC (rev 6695) +++ branches/stable_0_10_0/block.h 2009-03-05 19:42:19 UTC (rev 6696) @@ -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,