From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf27-0002V8-CH for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qmf21-0000T2-Cj for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:42 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:46817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf21-0000NN-9Z for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:41 -0400 Received: by mail-iy0-f173.google.com with SMTP id 39so4186308iyb.4 for ; Thu, 28 Jul 2011 21:50:41 -0700 (PDT) From: Devin Nakamura Date: Fri, 29 Jul 2011 00:49:50 -0400 Message-Id: <1311914994-20482-21-git-send-email-devin122@gmail.com> In-Reply-To: <1311914994-20482-1-git-send-email-devin122@gmail.com> References: <1311914994-20482-1-git-send-email-devin122@gmail.com> Subject: [Qemu-devel] [RFC 20/24] qcow2: add get_conversion_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Devin Nakamura Signed-off-by: Devin Nakamura --- block/qcow2.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 3bb28d2..86df65d 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1427,6 +1427,23 @@ static int qcow2_copy_header(BlockDriverState *bs) return qcow2_drop_leaked_clusters(bs); } +static int qcow2_get_conversion_options(BlockDriverState *bs, + BlockConversionOptions *options) +{ + BDRVQcowState *s = bs->opaque; + + options->image_size = bs->total_sectors * BDRV_SECTOR_SIZE; + options->cluster_size = s->cluster_sectors * BDRV_SECTOR_SIZE; + options->allocation_size = s->cluster_sectors * BDRV_SECTOR_SIZE; + if (s->crypt_method == QCOW_CRYPT_NONE) { + options->encryption_type = BLOCK_CRYPT_NONE; + } else if (s->crypt_method == QCOW_CRYPT_AES) { + options->encryption_type = BLOCK_CRYPT_AES; + } else { + return -1; //TODO: FIXME + } + return 0; +} static QEMUOptionParameter qcow2_create_options[] = { { .name = BLOCK_OPT_SIZE, @@ -1497,9 +1514,10 @@ static BlockDriver bdrv_qcow2 = { .create_options = qcow2_create_options, .bdrv_check = qcow2_check, - .bdrv_get_mapping = qcow2_get_mapping, - .bdrv_map = qcow2_map, - .bdrv_copy_header = qcow2_copy_header, + .bdrv_get_mapping = qcow2_get_mapping, + .bdrv_map = qcow2_map, + .bdrv_copy_header = qcow2_copy_header, + .bdrv_get_conversion_options = qcow2_get_conversion_options, }; static void bdrv_qcow2_init(void) -- 1.7.6.rc1