Patchwork [RFC,20/24] qcow2: add get_conversion_options()

login
register
mail settings
Submitter Devin Nakamura
Date July 29, 2011, 4:49 a.m.
Message ID <1311914994-20482-21-git-send-email-devin122@gmail.com>
Download mbox | patch
Permalink /patch/107352/
State New
Headers show

Comments

Devin Nakamura - July 29, 2011, 4:49 a.m.
Signed-off-by: Devin Nakamura <devin122@gmail.com>
---
 block/qcow2.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

Patch

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)