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