Re: [Qemu-devel] [PATCH 1/6] VMDK: enable twoGbMaxExtentFlat

2011-07-29 Thread Fam Zheng
Enable the createType 'twoGbMaxExtentFlat'. The supporting code is
already in.

Signed-off-by: Fam Zheng 
---
 block/vmdk.c |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/block/vmdk.c b/block/vmdk.c
index 37478d2..e22a893 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -551,7 +551,8 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int 
flags)
 if (vmdk_parse_description(buf, "createType", ct, sizeof(ct))) {
 return -EINVAL;
 }
-if (strcmp(ct, "monolithicFlat")) {
+if (strcmp(ct, "monolithicFlat") &&
+strcmp(ct, "twoGbMaxExtentFlat")) {
 fprintf(stderr,
 "VMDK: Not supported image type \"%s\""".\n", ct);
 return -ENOTSUP;
@@ -672,6 +673,7 @@ static int get_cluster_offset(BlockDriverState *bs,
 return 0;
 }
 
+offset -= (extent->end_sector - extent->sectors) * SECTOR_SIZE;
 l1_index = (offset >> 9) / extent->l1_entry_sectors;
 if (l1_index >= extent->l1_size) {
 return -1;



Re: [Qemu-devel] [PATCH 1/6] VMDK: enable twoGbMaxExtentFlat

2011-07-28 Thread Fam Zheng
Sorry, I missed one line in this patch. Will fix it in V2.

On Wed, Jul 27, 2011 at 5:27 PM, Fam Zheng  wrote:
> Enable the createType 'twoGbMaxExtentFlat'. The supporting code is
> already in.
>
> Signed-off-by: Fam Zheng 
> ---
>  block/vmdk.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/block/vmdk.c b/block/vmdk.c
> index 37478d2..9e6c67a 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -551,7 +551,8 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int 
> flags)
>     if (vmdk_parse_description(buf, "createType", ct, sizeof(ct))) {
>         return -EINVAL;
>     }
> -    if (strcmp(ct, "monolithicFlat")) {
> +    if (strcmp(ct, "monolithicFlat") &&
> +        strcmp(ct, "twoGbMaxExtentFlat")) {
>         fprintf(stderr,
>                 "VMDK: Not supported image type \"%s\""".\n", ct);
>         return -ENOTSUP;
>



-- 
Best regards!
Fam Zheng