From patchwork Fri Aug 12 15:19:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feiran Zheng X-Patchwork-Id: 109869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 58637B6F88 for ; Sat, 13 Aug 2011 02:07:30 +1000 (EST) Received: from localhost ([::1]:58906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrtXn-00060Z-Tb for incoming@patchwork.ozlabs.org; Fri, 12 Aug 2011 11:21:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrtXR-000548-CM for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrtXP-000230-Ky for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:45 -0400 Received: from mail-gw0-f45.google.com ([74.125.83.45]:44975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrtXP-00022p-Fu for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:43 -0400 Received: by gwb19 with SMTP id 19so2376022gwb.4 for ; Fri, 12 Aug 2011 08:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=KhHhOVNmLCa+bgXsKQyoG1CCaWaSRjp+51WN+ZSyJA8=; b=ezSzemj4K7Na3txCBm2e7i6aMTk/R3lhBg+AkoVb2KuxXZDIjXxYSBllWuN+ZbjLWq HnWVZPjLaWGHTWWMjx/ye73RCOBDG1wmOJstNCi3iS0A3pRPYDFT6opsEBV6FRywFyY6 xzGSl04Pz8/gj9gPRb1sHaMi2W+3Je/9OMqLQ= Received: by 10.142.165.8 with SMTP id n8mr119704wfe.447.1313162442425; Fri, 12 Aug 2011 08:20:42 -0700 (PDT) Received: from localhost.localdomain ([111.187.46.0]) by mx.google.com with ESMTPS id i2sm1543874wfd.8.2011.08.12.08.20.40 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 12 Aug 2011 08:20:42 -0700 (PDT) From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 12 Aug 2011 23:19:33 +0800 Message-Id: <1313162374-13147-8-git-send-email-famcool@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313162374-13147-1-git-send-email-famcool@gmail.com> References: <1313162374-13147-1-git-send-email-famcool@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.83.45 Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com Subject: [Qemu-devel] [PATCH v3 7/8] VMDK: bugfix, open Haiku vmdk image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- block/vmdk.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 7b1ae82..ad45b2f 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); } }