From 330cc46279f2fcd6f2d41d4e8beda8038c7a2fd9 Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Thu, 7 Nov 2013 13:18:21 +0100

Subject: [PATCH 87/87] vmdk: Implment bdrv_get_specific_info

RH-Author: Max Reitz <mreitz@redhat.com>

Message-id: <1383756824-6921-22-git-send-email-mreitz@redhat.com>

Patchwork-id: 55576

O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 21/21] vmdk: Implment bdrv_get_specific_info

Bugzilla: 980771

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

RH-Acked-by: Fam Zheng <famz@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

From: Fam Zheng <famz@redhat.com>

BZ: 980771

Implement .bdrv_get_specific_info to return the extent information.

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit f4c129a38a5430b7342a7a23f53a22831154612f)

Signed-off-by: Max Reitz <mreitz@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/vmdk.c               |   68 +++++++++++++++++++++++++++++++++++++++++++-

 qapi-schema.json           |   24 +++++++++++++++-

 tests/qemu-iotests/059     |    2 +-

 tests/qemu-iotests/059.out |    5 +--

 4 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/block/vmdk.c b/block/vmdk.c

index 8bef9f2..a3267fe 100644

--- a/block/vmdk.c

+++ b/block/vmdk.c

@@ -106,6 +106,7 @@ typedef struct VmdkExtent {

     uint32_t l2_cache_counts[L2_CACHE_SIZE];

     int64_t cluster_sectors;

+    char *type;

 } VmdkExtent;

 typedef struct BDRVVmdkState {

@@ -113,11 +114,13 @@ typedef struct BDRVVmdkState {

     uint64_t desc_offset;

     bool cid_updated;

     bool cid_checked;

+    uint32_t cid;

     uint32_t parent_cid;

     int num_extents;

     /* Extent array with num_extents entries, ascend ordered by address */

     VmdkExtent *extents;

     Error *migration_blocker;

+    char *create_type;

 } BDRVVmdkState;

 typedef struct VmdkMetaData {

@@ -214,6 +217,7 @@ static void vmdk_free_extents(BlockDriverState *bs)

         g_free(e->l1_table);

         g_free(e->l2_cache);

         g_free(e->l1_backup_table);

+        g_free(e->type);

         if (e->file != bs->file) {

             bdrv_delete(e->file);

         }

@@ -534,6 +538,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,

     uint32_t l1_size, l1_entry_sectors;

     VMDK4Header header;

     VmdkExtent *extent;

+    BDRVVmdkState *s = bs->opaque;

     int64_t l1_backup_offset = 0;

     ret = bdrv_pread(file, sizeof(magic), &header, sizeof(header));

@@ -549,6 +554,10 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,

         }

     }

+    if (!s->create_type) {

+        s->create_type = g_strdup("monolithicSparse");

+    }

+

     if (le64_to_cpu(header.gd_offset) == VMDK4_GD_AT_END) {

         /*

          * The footer takes precedence over the header, so read it in. The

@@ -709,6 +718,8 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,

     int64_t flat_offset;

     char extent_path[PATH_MAX];

     BlockDriverState *extent_file;

+    BDRVVmdkState *s = bs->opaque;

+    VmdkExtent *extent;

     while (*p) {

         /* parse extent line:

@@ -749,7 +760,6 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,

         /* save to extents array */

         if (!strcmp(type, "FLAT") || !strcmp(type, "VMFS")) {

             /* FLAT extent */

-            VmdkExtent *extent;

             ret = vmdk_add_extent(bs, extent_file, true, sectors,

                             0, 0, 0, 0, 0, &extent, errp);

@@ -764,10 +774,12 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,

                 bdrv_delete(extent_file);

                 return ret;

             }

+            extent = &s->extents[s->num_extents - 1];

         } else {

             error_setg(errp, "Unsupported extent type '%s'", type);

             return -ENOTSUP;

         }

+        extent->type = g_strdup(type);

 next_line:

         /* move to next line */

         while (*p && *p != '\n') {

@@ -812,6 +824,7 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags,

         ret = -ENOTSUP;

         goto exit;

     }

+    s->create_type = g_strdup(ct);

     s->desc_offset = 0;

     ret = vmdk_parse_extents(buf, bs, bs->file->filename, errp);

 exit:

@@ -838,6 +851,7 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags,

     if (ret) {

         goto fail;

     }

+    s->cid = vmdk_read_cid(bs, 0);

     s->parent_cid = vmdk_read_cid(bs, 1);

     qemu_co_mutex_init(&s->lock);

@@ -850,6 +864,8 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags,

     return 0;

 fail:

+    g_free(s->create_type);

+    s->create_type = NULL;

     vmdk_free_extents(bs);

     return ret;

 }

@@ -1761,6 +1777,7 @@ static void vmdk_close(BlockDriverState *bs)

     BDRVVmdkState *s = bs->opaque;

     vmdk_free_extents(bs);

+    g_free(s->create_type);

     migrate_del_blocker(s->migration_blocker);

     error_free(s->migration_blocker);

@@ -1822,6 +1839,54 @@ static int vmdk_has_zero_init(BlockDriverState *bs)

     return 1;

 }

+static ImageInfo *vmdk_get_extent_info(VmdkExtent *extent)

+{

+    ImageInfo *info = g_new0(ImageInfo, 1);

+

+    *info = (ImageInfo){

+        .filename         = g_strdup(extent->file->filename),

+        .format           = g_strdup(extent->type),

+        .virtual_size     = extent->sectors * BDRV_SECTOR_SIZE,

+        .compressed       = extent->compressed,

+        .has_compressed   = extent->compressed,

+        .cluster_size     = extent->cluster_sectors * BDRV_SECTOR_SIZE,

+        .has_cluster_size = !extent->flat,

+    };

+

+    return info;

+}

+

+static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs)

+{

+    int i;

+    BDRVVmdkState *s = bs->opaque;

+    ImageInfoSpecific *spec_info = g_new0(ImageInfoSpecific, 1);

+    ImageInfoList **next;

+

+    *spec_info = (ImageInfoSpecific){

+        .kind = IMAGE_INFO_SPECIFIC_KIND_VMDK,

+        {

+            .vmdk = g_new0(ImageInfoSpecificVmdk, 1),

+        },

+    };

+

+    *spec_info->vmdk = (ImageInfoSpecificVmdk) {

+        .create_type = g_strdup(s->create_type),

+        .cid = s->cid,

+        .parent_cid = s->parent_cid,

+    };

+

+    next = &spec_info->vmdk->extents;

+    for (i = 0; i < s->num_extents; i++) {

+        *next = g_new0(ImageInfoList, 1);

+        (*next)->value = vmdk_get_extent_info(&s->extents[i]);

+        (*next)->next = NULL;

+        next = &(*next)->next;

+    }

+

+    return spec_info;

+}

+

 static QEMUOptionParameter vmdk_create_options[] = {

     {

         .name = BLOCK_OPT_SIZE,

@@ -1874,6 +1939,7 @@ static BlockDriver bdrv_vmdk = {

     .bdrv_co_get_block_status     = vmdk_co_get_block_status,

     .bdrv_get_allocated_file_size = vmdk_get_allocated_file_size,

     .bdrv_has_zero_init           = vmdk_has_zero_init,

+    .bdrv_get_specific_info       = vmdk_get_specific_info,

     .create_options               = vmdk_create_options,

 };

diff --git a/qapi-schema.json b/qapi-schema.json

index 99b05b7..64696a9 100644

--- a/qapi-schema.json

+++ b/qapi-schema.json

@@ -225,6 +225,27 @@

   } }

 ##

+# @ImageInfoSpecificVmdk:

+#

+# @create_type: The create type of VMDK image

+#

+# @cid: Content id of image

+#

+# @parent-cid: Parent VMDK image's cid

+#

+# @extents: List of extent files

+#

+# Since: 1.7

+##

+{ 'type': 'ImageInfoSpecificVmdk',

+  'data': {

+      'create-type': 'str',

+      'cid': 'int',

+      'parent-cid': 'int',

+      'extents': ['ImageInfo']

+  } }

+

+##

 # @ImageInfoSpecific:

 #

 # A discriminated record of image format specific information structures.

@@ -234,7 +255,8 @@

 { 'union': 'ImageInfoSpecific',

   'data': {

-      'qcow2': 'ImageInfoSpecificQCow2'

+      'qcow2': 'ImageInfoSpecificQCow2',

+      'vmdk': 'ImageInfoSpecificVmdk'

   } }

 ##

diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059

index 26d4538..36103e1 100755

--- a/tests/qemu-iotests/059

+++ b/tests/qemu-iotests/059

@@ -69,7 +69,7 @@ poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"

 echo "=== Testing monolithicFlat creation and opening ==="

 echo

 IMGOPTS="subformat=monolithicFlat" _make_test_img 2G

-$QEMU_IMG info $TEST_IMG | _filter_testdir

+_img_info

 echo

 echo "=== Testing monolithicFlat with zeroed_grain ==="

diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out

index 2b29ca9..5829794 100644

--- a/tests/qemu-iotests/059.out

+++ b/tests/qemu-iotests/059.out

@@ -18,10 +18,9 @@ no file open, try 'help open'

 === Testing monolithicFlat creation and opening ===

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648

-image: TEST_DIR/t.vmdk

-file format: vmdk

+image: TEST_DIR/t.IMGFMT

+file format: IMGFMT

 virtual size: 2.0G (2147483648 bytes)

-disk size: 4.0K

 === Testing monolithicFlat with zeroed_grain ===

 qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain

-- 

1.7.1