From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrtXB-0004He-Ly for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrtXA-0001yj-L9 for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:29 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:65257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrtXA-0001yO-Cw for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:28 -0400 Received: by pzk37 with SMTP id 37so6748610pzk.29 for ; Fri, 12 Aug 2011 08:20:27 -0700 (PDT) From: Fam Zheng Date: Fri, 12 Aug 2011 23:19:27 +0800 Message-Id: <1313162374-13147-2-git-send-email-famcool@gmail.com> In-Reply-To: <1313162374-13147-1-git-send-email-famcool@gmail.com> References: <1313162374-13147-1-git-send-email-famcool@gmail.com> Subject: [Qemu-devel] [PATCH v3 1/8] VMDK: enable twoGbMaxExtentFlat List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com 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;