[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.2 11/11] vmdk: Leave bdi intact if -ENOTSUP in
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.2 11/11] vmdk: Leave bdi intact if -ENOTSUP in vmdk_get_info |
Date: |
Fri, 14 Nov 2014 11:05:57 +0000 |
From: Fam Zheng <address@hidden>
When extent types don't match, we return -ENOTSUP. In this case, be
polite to the caller and don't modify bdi.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/vmdk.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 673d3f5..2cbfd3e 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -2137,23 +2137,29 @@ static ImageInfoSpecific
*vmdk_get_specific_info(BlockDriverState *bs)
return spec_info;
}
+static bool vmdk_extents_type_eq(const VmdkExtent *a, const VmdkExtent *b)
+{
+ return a->flat == b->flat &&
+ a->compressed == b->compressed &&
+ (a->flat || a->cluster_sectors == b->cluster_sectors);
+}
+
static int vmdk_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
{
int i;
BDRVVmdkState *s = bs->opaque;
assert(s->num_extents);
- bdi->needs_compressed_writes = s->extents[0].compressed;
- if (!s->extents[0].flat) {
- bdi->cluster_size = s->extents[0].cluster_sectors << BDRV_SECTOR_BITS;
- }
+
/* See if we have multiple extents but they have different cases */
for (i = 1; i < s->num_extents; i++) {
- if (bdi->needs_compressed_writes != s->extents[i].compressed ||
- (bdi->cluster_size && bdi->cluster_size !=
- s->extents[i].cluster_sectors << BDRV_SECTOR_BITS)) {
+ if (!vmdk_extents_type_eq(&s->extents[0], &s->extents[i])) {
return -ENOTSUP;
}
}
+ bdi->needs_compressed_writes = s->extents[0].compressed;
+ if (!s->extents[0].flat) {
+ bdi->cluster_size = s->extents[0].cluster_sectors << BDRV_SECTOR_BITS;
+ }
return 0;
}
--
2.1.0
- [Qemu-devel] [PULL for-2.2 01/11] ahci: Fix byte count regression for ATAPI/PIO, (continued)
- [Qemu-devel] [PULL for-2.2 01/11] ahci: Fix byte count regression for ATAPI/PIO, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 02/11] ide: repair PIO transfers for cases where nsector > 1, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 03/11] ahci: unify sglist preparation, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 04/11] ide: Correct handling of malformed/short PRDTs, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 05/11] ahci: add is_ncq predicate helper, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 06/11] ahci: Fix FIS decomposition, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 07/11] ahci: Reorder error cases in handle_cmd, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 08/11] ahci: Check cmd_fis[1] more explicitly, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 09/11] ahci: factor out FIS decomposition from handle_cmd, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 10/11] block: Fix max nb_sectors in bdrv_make_zero, Stefan Hajnoczi, 2014/11/14
- [Qemu-devel] [PULL for-2.2 11/11] vmdk: Leave bdi intact if -ENOTSUP in vmdk_get_info,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL for-2.2 00/11] Block patches, Peter Maydell, 2014/11/14