yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-vmdk-Leave-bdi-intact-if-ENOTSUP-in-vmdk_get_info.patch

34b321
From 824614c344ceeb60dd27b38cfdb190471b6a2ef9 Mon Sep 17 00:00:00 2001
34b321
From: Fam Zheng <famz@redhat.com>
34b321
Date: Mon, 15 Feb 2016 09:28:14 +0100
34b321
Subject: [PATCH 01/18] vmdk: Leave bdi intact if -ENOTSUP in vmdk_get_info
34b321
34b321
RH-Author: Fam Zheng <famz@redhat.com>
34b321
Message-id: <1455528511-9357-2-git-send-email-famz@redhat.com>
34b321
Patchwork-id: 69167
34b321
O-Subject: [RHEL-7.3 qemu-kvm PATCH 01/18] vmdk: Leave bdi intact if -ENOTSUP in vmdk_get_info
34b321
Bugzilla: 1299250
34b321
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
34b321
RH-Acked-by: Max Reitz <mreitz@redhat.com>
34b321
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
34b321
34b321
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1299250
34b321
34b321
When extent types don't match, we return -ENOTSUP. In this case, be
34b321
polite to the caller and don't modify bdi.
34b321
34b321
Signed-off-by: Fam Zheng <famz@redhat.com>
34b321
Reviewed-by: Max Reitz <mreitz@redhat.com>
34b321
Message-id: 1415938161-16217-1-git-send-email-famz@redhat.com
34b321
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
34b321
(cherry picked from commit 5f58330790b72c4705b373ee0646fb3adf800b4e)
34b321
Signed-off-by: Fam Zheng <famz@redhat.com>
34b321
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
34b321
---
34b321
 block/vmdk.c | 20 +++++++++++++-------
34b321
 1 file changed, 13 insertions(+), 7 deletions(-)
34b321
34b321
diff --git a/block/vmdk.c b/block/vmdk.c
34b321
index 6b015ab..fa53d2f 100644
34b321
--- a/block/vmdk.c
34b321
+++ b/block/vmdk.c
34b321
@@ -2137,23 +2137,29 @@ static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs)
34b321
     return spec_info;
34b321
 }
34b321
 
34b321
+static bool vmdk_extents_type_eq(const VmdkExtent *a, const VmdkExtent *b)
34b321
+{
34b321
+    return a->flat == b->flat &&
34b321
+           a->compressed == b->compressed &&
34b321
+           (a->flat || a->cluster_sectors == b->cluster_sectors);
34b321
+}
34b321
+
34b321
 static int vmdk_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
34b321
 {
34b321
     int i;
34b321
     BDRVVmdkState *s = bs->opaque;
34b321
     assert(s->num_extents);
34b321
-    bdi->needs_compressed_writes = s->extents[0].compressed;
34b321
-    if (!s->extents[0].flat) {
34b321
-        bdi->cluster_size = s->extents[0].cluster_sectors << BDRV_SECTOR_BITS;
34b321
-    }
34b321
+
34b321
     /* See if we have multiple extents but they have different cases */
34b321
     for (i = 1; i < s->num_extents; i++) {
34b321
-        if (bdi->needs_compressed_writes != s->extents[i].compressed ||
34b321
-            (bdi->cluster_size && bdi->cluster_size !=
34b321
-                s->extents[i].cluster_sectors << BDRV_SECTOR_BITS)) {
34b321
+        if (!vmdk_extents_type_eq(&s->extents[0], &s->extents[i])) {
34b321
             return -ENOTSUP;
34b321
         }
34b321
     }
34b321
+    bdi->needs_compressed_writes = s->extents[0].compressed;
34b321
+    if (!s->extents[0].flat) {
34b321
+        bdi->cluster_size = s->extents[0].cluster_sectors << BDRV_SECTOR_BITS;
34b321
+    }
34b321
     return 0;
34b321
 }
34b321
 
34b321
-- 
34b321
1.8.3.1
34b321