Patchwork [v5,4/6] qcow2: Add support for ImageInfoSpecific

login
register
mail settings
Submitter Max Reitz
Date Sept. 23, 2013, 12:09 p.m.
Message ID <1379938162-14005-5-git-send-email-mreitz@redhat.com>
Download mbox | patch
Permalink /patch/277162/
State New
Headers show

Comments

Max Reitz - Sept. 23, 2013, 12:09 p.m.
Add a new ImageInfoSpecificQCow2 type as a subtype of ImageInfoSpecific.
This contains the compatibility level as a string and an optional
lazy_refcounts boolean (optional means mandatory for compat >= 1.1 and
not available for compat == 0.10).

Also, add qcow2_get_specific_info, which returns this information.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.c    | 19 +++++++++++++++++++
 qapi-schema.json | 16 ++++++++++++++++
 2 files changed, 35 insertions(+)
Eric Blake - Sept. 30, 2013, 4:25 p.m.
On 09/23/2013 06:09 AM, Max Reitz wrote:
> Add a new ImageInfoSpecificQCow2 type as a subtype of ImageInfoSpecific.
> This contains the compatibility level as a string and an optional
> lazy_refcounts boolean (optional means mandatory for compat >= 1.1 and
> not available for compat == 0.10).
> 
> Also, add qcow2_get_specific_info, which returns this information.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block/qcow2.c    | 19 +++++++++++++++++++
>  qapi-schema.json | 16 ++++++++++++++++
>  2 files changed, 35 insertions(+)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

Patch

diff --git a/block/qcow2.c b/block/qcow2.c
index 318d95d..f080a8a 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1810,6 +1810,24 @@  static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
     return 0;
 }
 
+static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs)
+{
+    BDRVQcowState *s = bs->opaque;
+    ImageInfoSpecific *spec_info = g_new0(ImageInfoSpecific, 1);
+
+    spec_info->kind = IMAGE_INFO_SPECIFIC_KIND_QCOW2;
+    spec_info->qcow2 = g_new0(ImageInfoSpecificQCow2, 1);
+    if (s->qcow_version == 2) {
+        spec_info->qcow2->compat = g_strdup("0.10");
+    } else if (s->qcow_version == 3) {
+        spec_info->qcow2->compat = g_strdup("1.1");
+        spec_info->qcow2->lazy_refcounts = s->use_lazy_refcounts;
+        spec_info->qcow2->has_lazy_refcounts = true;
+    }
+
+    return spec_info;
+}
+
 #if 0
 static void dump_refcounts(BlockDriverState *bs)
 {
@@ -2130,6 +2148,7 @@  static BlockDriver bdrv_qcow2 = {
     .bdrv_snapshot_list     = qcow2_snapshot_list,
     .bdrv_snapshot_load_tmp     = qcow2_snapshot_load_tmp,
     .bdrv_get_info      = qcow2_get_info,
+    .bdrv_get_specific_info = qcow2_get_specific_info,
 
     .bdrv_save_vmstate    = qcow2_save_vmstate,
     .bdrv_load_vmstate    = qcow2_load_vmstate,
diff --git a/qapi-schema.json b/qapi-schema.json
index cbad705..d697da2 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -210,6 +210,21 @@ 
             'vm-clock-sec': 'int', 'vm-clock-nsec': 'int' } }
 
 ##
+# @ImageInfoSpecificQCow2:
+#
+# @compat: compatibility level
+#
+# @lazy-refcounts: #optional on or off; only valid for compat >= 1.1
+#
+# Since: 1.7
+##
+{ 'type': 'ImageInfoSpecificQCow2',
+  'data': {
+      'compat': 'str',
+      '*lazy-refcounts': 'bool'
+  } }
+
+##
 # @ImageInfoSpecific:
 #
 # A discriminated record of image format specific information structures.
@@ -219,6 +234,7 @@ 
 
 { 'union': 'ImageInfoSpecific',
   'data': {
+      'qcow2': 'ImageInfoSpecificQCow2'
   } }
 
 ##