From patchwork Fri Jul 29 04:49:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Nakamura X-Patchwork-Id: 107352 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 19B9AB6F68 for ; Fri, 29 Jul 2011 15:57:13 +1000 (EST) Received: from localhost ([::1]:37581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf4L-0007zA-JJ for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2011 00:53:05 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=WBJgQ8VhJ0BRb4+Dht+mcp4n0rXQqnw5Ehm4+3/adF4=; b=LPlbRvc+dm5SE+lLvD8EufeNAqw8A0TEX768qDW/DnyZRI+cRO+wzrB076VM0y1cz/ KmvaXygWHFL1a25SdguWd04e95m1+g2OD09p1rQJn7d+OTHgxfPkyERcq8/467kfYdRJ ioU09FgrKvJg4MdXu6OIRcRoIFef/G/Uw3iB0= Received: by 10.231.47.207 with SMTP id o15mr571273ibf.35.1311915040929; Thu, 28 Jul 2011 21:50:40 -0700 (PDT) Received: from localhost.localdomain (d72-39-252-38.home1.cgocable.net [72.39.252.38]) by mx.google.com with ESMTPS id v16sm1109424ibf.25.2011.07.28.21.50.39 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jul 2011 21:50:40 -0700 (PDT) From: Devin Nakamura To: qemu-devel@nongnu.org Date: Fri, 29 Jul 2011 00:49:50 -0400 Message-Id: <1311914994-20482-21-git-send-email-devin122@gmail.com> X-Mailer: git-send-email 1.7.6.rc1 In-Reply-To: <1311914994-20482-1-git-send-email-devin122@gmail.com> References: <1311914994-20482-1-git-send-email-devin122@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: kwolf@redhat.com, Devin Nakamura Subject: [Qemu-devel] [RFC 20/24] qcow2: add get_conversion_options() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)