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