[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/31] VMDK: bugfix, open Haiku vmdk image
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 25/31] VMDK: bugfix, open Haiku vmdk image |
Date: |
Tue, 6 Sep 2011 17:39:40 +0200 |
From: Fam Zheng <address@hidden>
Haiku provides a specially formed vmdk image, which let qemu abort. It a
combination of sparse header and flat data (i.e. with not l1/l2 table at
all). The fix is turn to descriptor when sparse header is zero in field
'capacity'.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vmdk.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 54f7441..892b18e 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -408,6 +408,9 @@ static int vmdk_open_vmdk3(BlockDriverState *bs,
return ret;
}
+static int vmdk_open_desc_file(BlockDriverState *bs, int flags,
+ int64_t desc_offset);
+
static int vmdk_open_vmdk4(BlockDriverState *bs,
BlockDriverState *file,
int flags)
@@ -422,6 +425,9 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
if (ret < 0) {
return ret;
}
+ if (header.capacity == 0 && header.desc_offset) {
+ return vmdk_open_desc_file(bs, flags, header.desc_offset << 9);
+ }
l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte)
* le64_to_cpu(header.granularity);
if (l1_entry_sectors <= 0) {
@@ -559,7 +565,7 @@ static int vmdk_parse_extents(const char *desc,
BlockDriverState *bs,
extent = vmdk_add_extent(bs, extent_file, true, sectors,
0, 0, 0, 0, sectors);
- extent->flat_start_offset = flat_offset;
+ extent->flat_start_offset = flat_offset << 9;
} else if (!strcmp(type, "SPARSE")) {
/* SPARSE extent */
ret = vmdk_open_sparse(bs, extent_file, bs->open_flags);
@@ -582,14 +588,15 @@ next_line:
return 0;
}
-static int vmdk_open_desc_file(BlockDriverState *bs, int flags)
+static int vmdk_open_desc_file(BlockDriverState *bs, int flags,
+ int64_t desc_offset)
{
int ret;
char buf[2048];
char ct[128];
BDRVVmdkState *s = bs->opaque;
- ret = bdrv_pread(bs->file, 0, buf, sizeof(buf));
+ ret = bdrv_pread(bs->file, desc_offset, buf, sizeof(buf));
if (ret < 0) {
return ret;
}
@@ -635,7 +642,7 @@ static int vmdk_open(BlockDriverState *bs, int flags)
s->parent_cid = vmdk_read_cid(bs, 1);
return 0;
} else {
- return vmdk_open_desc_file(bs, flags);
+ return vmdk_open_desc_file(bs, flags, 0);
}
}
--
1.7.6
- [Qemu-devel] [PATCH 12/31] block: Leave tracking media change to device models, (continued)
- [Qemu-devel] [PATCH 12/31] block: Leave tracking media change to device models, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 14/31] block: Clean up bdrv_flush_all(), Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 13/31] fdc: Make media change detection more robust, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 15/31] savevm: Include writable devices with removable media, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 20/31] VMDK: add twoGbMaxExtentSparse support, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 16/31] xen: Clean up pci_piix3_xen_ide_unplug()'s test for "not a CD", Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 22/31] VMDK: Opening compressed extent., Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 23/31] VMDK: read/write compressed extent, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 21/31] VMDK: separate vmdk_read_extent/vmdk_write_extent, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 19/31] VMDK: enable twoGbMaxExtentFlat, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 25/31] VMDK: bugfix, open Haiku vmdk image,
Kevin Wolf <=
- [Qemu-devel] [PATCH 24/31] VMDK: creating streamOptimized subformat, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 18/31] block: Declare qemu_blockalign() in block.h, not block_int.h, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 29/31] scsi: refine constants for READ CAPACITY 16, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 26/31] VMDK: bugfix, opening vSphere 4 exported image, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 31/31] scsi: improve MODE SENSE emulation, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 27/31] scsi: execute SYNCHRONIZE_CACHE asynchronously, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 30/31] scsi: fill in additional sense length correctly, Kevin Wolf, 2011/09/06
- [Qemu-devel] [PATCH 28/31] scsi: fix accounting of writes, Kevin Wolf, 2011/09/06
- Re: [Qemu-devel] [PULL 00/31] Block patches, Anthony Liguori, 2011/09/08