cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 42d65e8b2ebd637035fd3ccb5306cbdd37808cd3 Mon Sep 17 00:00:00 2001
218e99
From: Max Reitz <mreitz@redhat.com>
218e99
Date: Wed, 6 Nov 2013 16:53:37 +0100
218e99
Subject: [PATCH 80/87] qcow2: Add support for ImageInfoSpecific
218e99
218e99
RH-Author: Max Reitz <mreitz@redhat.com>
218e99
Message-id: <1383756824-6921-15-git-send-email-mreitz@redhat.com>
218e99
Patchwork-id: 55569
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 14/21] qcow2: Add support for ImageInfoSpecific
218e99
Bugzilla: 980771
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
RH-Acked-by: Fam Zheng <famz@redhat.com>
218e99
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
218e99
218e99
BZ: 980771
218e99
218e99
Add a new ImageInfoSpecificQCow2 type as a subtype of ImageInfoSpecific.
218e99
This contains the compatibility level as a string and an optional
218e99
lazy_refcounts boolean (optional means mandatory for compat >= 1.1 and
218e99
not available for compat == 0.10).
218e99
218e99
Also, add qcow2_get_specific_info, which returns this information.
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
(cherry picked from commit 37764dfb71c4d0d058b71ba33340c6beab7d5a66)
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
---
218e99
 block/qcow2.c    | 28 ++++++++++++++++++++++++++++
218e99
 qapi-schema.json | 16 ++++++++++++++++
218e99
 2 files changed, 44 insertions(+)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 block/qcow2.c    |   28 ++++++++++++++++++++++++++++
218e99
 qapi-schema.json |   16 ++++++++++++++++
218e99
 2 files changed, 44 insertions(+), 0 deletions(-)
218e99
218e99
diff --git a/block/qcow2.c b/block/qcow2.c
218e99
index 01b535d..f852d64 100644
218e99
--- a/block/qcow2.c
218e99
+++ b/block/qcow2.c
218e99
@@ -1889,6 +1889,33 @@ static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
218e99
     return 0;
218e99
 }
218e99
 
218e99
+static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs)
218e99
+{
218e99
+    BDRVQcowState *s = bs->opaque;
218e99
+    ImageInfoSpecific *spec_info = g_new(ImageInfoSpecific, 1);
218e99
+
218e99
+    *spec_info = (ImageInfoSpecific){
218e99
+        .kind  = IMAGE_INFO_SPECIFIC_KIND_QCOW2,
218e99
+        {
218e99
+            .qcow2 = g_new(ImageInfoSpecificQCow2, 1),
218e99
+        },
218e99
+    };
218e99
+    if (s->qcow_version == 2) {
218e99
+        *spec_info->qcow2 = (ImageInfoSpecificQCow2){
218e99
+            .compat = g_strdup("0.10"),
218e99
+        };
218e99
+    } else if (s->qcow_version == 3) {
218e99
+        *spec_info->qcow2 = (ImageInfoSpecificQCow2){
218e99
+            .compat             = g_strdup("1.1"),
218e99
+            .lazy_refcounts     = s->compatible_features &
218e99
+                                  QCOW2_COMPAT_LAZY_REFCOUNTS,
218e99
+            .has_lazy_refcounts = true,
218e99
+        };
218e99
+    }
218e99
+
218e99
+    return spec_info;
218e99
+}
218e99
+
218e99
 #if 0
218e99
 static void dump_refcounts(BlockDriverState *bs)
218e99
 {
218e99
@@ -2024,6 +2051,7 @@ static BlockDriver bdrv_qcow2 = {
218e99
     .bdrv_snapshot_list     = qcow2_snapshot_list,
218e99
     .bdrv_snapshot_load_tmp     = qcow2_snapshot_load_tmp,
218e99
     .bdrv_get_info      = qcow2_get_info,
218e99
+    .bdrv_get_specific_info = qcow2_get_specific_info,
218e99
 
218e99
     .bdrv_save_vmstate    = qcow2_save_vmstate,
218e99
     .bdrv_load_vmstate    = qcow2_load_vmstate,
218e99
diff --git a/qapi-schema.json b/qapi-schema.json
218e99
index 934ac7f..3c00ddd 100644
218e99
--- a/qapi-schema.json
218e99
+++ b/qapi-schema.json
218e99
@@ -210,6 +210,21 @@
218e99
             'vm-clock-sec': 'int', 'vm-clock-nsec': 'int' } }
218e99
 
218e99
 ##
218e99
+# @ImageInfoSpecificQCow2:
218e99
+#
218e99
+# @compat: compatibility level
218e99
+#
218e99
+# @lazy-refcounts: #optional on or off; only valid for compat >= 1.1
218e99
+#
218e99
+# Since: 1.7
218e99
+##
218e99
+{ 'type': 'ImageInfoSpecificQCow2',
218e99
+  'data': {
218e99
+      'compat': 'str',
218e99
+      '*lazy-refcounts': 'bool'
218e99
+  } }
218e99
+
218e99
+##
218e99
 # @ImageInfoSpecific:
218e99
 #
218e99
 # A discriminated record of image format specific information structures.
218e99
@@ -219,6 +234,7 @@
218e99
 
218e99
 { 'union': 'ImageInfoSpecific',
218e99
   'data': {
218e99
+      'qcow2': 'ImageInfoSpecificQCow2'
218e99
   } }
218e99
 
218e99
 ##
218e99
-- 
218e99
1.7.1
218e99