From patchwork Wed Jul 27 09:27:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feiran Zheng X-Patchwork-Id: 107003 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 109B3B6F62 for ; Wed, 27 Jul 2011 19:29:17 +1000 (EST) Received: from localhost ([::1]:48589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm0QN-0003a8-Ii for incoming@patchwork.ozlabs.org; Wed, 27 Jul 2011 05:29:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm0Q9-00035M-DW for qemu-devel@nongnu.org; Wed, 27 Jul 2011 05:28:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qm0Q8-0001lX-3c for qemu-devel@nongnu.org; Wed, 27 Jul 2011 05:28:53 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:52297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm0Q7-0001lR-RT for qemu-devel@nongnu.org; Wed, 27 Jul 2011 05:28:52 -0400 Received: by gyg8 with SMTP id 8so1078016gyg.4 for ; Wed, 27 Jul 2011 02:28:51 -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=+aMVDi4FLkB5uOJjQx8ZcYgOILsW7qcEOMNh3p21eN4=; b=Mb93fo1bseGR5tnNBVn61ZXuu9fEHqw5bAUx9rg0MBOsBKgIi2TruDrNnUtMjMoQWg DVVfwh9hgSHA4NPfThDVhjaw2uyK431lp9eWnU1DHU+Jwxv0QmsWlTSrjFY0mEUDmWqq WNw332WDvrW28MLk5WmeQtFoioZsECOx4Ektw= Received: by 10.68.58.231 with SMTP id u7mr8248928pbq.258.1311758930585; Wed, 27 Jul 2011 02:28:50 -0700 (PDT) Received: from localhost.localdomain ([111.187.44.139]) by mx.google.com with ESMTPS id l7sm1504992pbh.26.2011.07.27.02.28.47 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Jul 2011 02:28:50 -0700 (PDT) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 27 Jul 2011 17:27:42 +0800 Message-Id: <1311758866-30029-3-git-send-email-famcool@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1311758866-30029-1-git-send-email-famcool@gmail.com> References: <1311758866-30029-1-git-send-email-famcool@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.160.173 Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com Subject: [Qemu-devel] [PATCH 2/6] VMDK: add twoGbMaxExtentSparse support 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 Add twoGbMaxExtentSparse support. Only opening code is changed. Signed-off-by: Fam Zheng --- block/vmdk.c | 124 ++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 77 insertions(+), 47 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 9e6c67a..9d1ae32 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -357,7 +357,9 @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent) return ret; } -static int vmdk_open_vmdk3(BlockDriverState *bs, int flags) +static int vmdk_open_vmdk3(BlockDriverState *bs, + BlockDriverState *file, + int flags) { int ret; uint32_t magic; @@ -365,10 +367,9 @@ static int vmdk_open_vmdk3(BlockDriverState *bs, int flags) BDRVVmdkState *s = bs->opaque; VmdkExtent *extent; - s->desc_offset = 0x200; - ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); + ret = bdrv_pread(file, sizeof(magic), &header, sizeof(header)); if (ret < 0) { - goto fail; + return ret; } extent = vmdk_add_extent(bs, bs->file, false, @@ -378,17 +379,16 @@ static int vmdk_open_vmdk3(BlockDriverState *bs, int flags) le32_to_cpu(header.granularity)); ret = vmdk_init_tables(bs, extent); if (ret) { - /* vmdk_init_tables cleans up on fail, so only free allocation of - * vmdk_add_extent here. */ - goto fail; + /* free extent allocated by vmdk_add_extent */ + s->num_extents--; + qemu_realloc(s->extents, s->num_extents * sizeof(VmdkExtent)); } - return 0; - fail: - vmdk_free_extents(bs); return ret; } -static int vmdk_open_vmdk4(BlockDriverState *bs, int flags) +static int vmdk_open_vmdk4(BlockDriverState *bs, + BlockDriverState *file, + int flags) { int ret; uint32_t magic; @@ -397,39 +397,30 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, int flags) BDRVVmdkState *s = bs->opaque; VmdkExtent *extent; - s->desc_offset = 0x200; - ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); + ret = bdrv_pread(file, sizeof(magic), &header, sizeof(header)); if (ret < 0) { - goto fail; + return ret; } l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) * le64_to_cpu(header.granularity); + if (l1_entry_sectors <= 0) { + return -EINVAL; + } l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1) / l1_entry_sectors; - extent = vmdk_add_extent(bs, bs->file, false, + extent = vmdk_add_extent(bs, file, false, le64_to_cpu(header.capacity), le64_to_cpu(header.gd_offset) << 9, le64_to_cpu(header.rgd_offset) << 9, l1_size, le32_to_cpu(header.num_gtes_per_gte), le64_to_cpu(header.granularity)); - if (extent->l1_entry_sectors <= 0) { - ret = -EINVAL; - goto fail; - } - /* try to open parent images, if exist */ - ret = vmdk_parent_open(bs); - if (ret) { - goto fail; - } - s->parent_cid = vmdk_read_cid(bs, 1); ret = vmdk_init_tables(bs, extent); if (ret) { - goto fail; + /* free extent allocated by vmdk_add_extent */ + s->num_extents--; + qemu_realloc(s->extents, s->num_extents * sizeof(VmdkExtent)); } - return 0; - fail: - vmdk_free_extents(bs); return ret; } @@ -460,6 +451,35 @@ static int vmdk_parse_description(const char *desc, const char *opt_name, return 0; } +/* Open an extent file and append to bs array */ +static int vmdk_open_sparse(BlockDriverState *bs, + BlockDriverState *file, + int flags) +{ + int ret; + uint32_t magic; + + if (bdrv_pread(file, 0, &magic, sizeof(magic)) != sizeof(magic)) { + return -EIO; + } + + magic = be32_to_cpu(magic); + if (magic == VMDK3_MAGIC) { + ret = vmdk_open_vmdk3(bs, file, flags); + if (ret) { + return ret; + } + } else if (magic == VMDK4_MAGIC) { + ret = vmdk_open_vmdk4(bs, file, flags); + if (ret) { + return ret; + } + } else { + return -EINVAL; + } + return 0; +} + static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, const char *desc_file_path) { @@ -470,6 +490,8 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, const char *p = desc; int64_t sectors = 0; int64_t flat_offset; + char extent_path[PATH_MAX]; + BlockDriverState *extent_file; while (*p) { /* parse extent line: @@ -504,22 +526,28 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, goto next_line; } + path_combine(extent_path, sizeof(extent_path), + desc_file_path, fname); + ret = bdrv_file_open(&extent_file, extent_path, bs->open_flags); + if (ret) { + return ret; + } + /* save to extents array */ if (!strcmp(type, "FLAT")) { /* FLAT extent */ - char extent_path[PATH_MAX]; - BlockDriverState *extent_file; VmdkExtent *extent; - path_combine(extent_path, sizeof(extent_path), - desc_file_path, fname); - ret = bdrv_file_open(&extent_file, extent_path, bs->open_flags); - if (ret) { - return ret; - } extent = vmdk_add_extent(bs, extent_file, true, sectors, 0, 0, 0, 0, sectors); extent->flat_start_offset = flat_offset; + } else if (!strcmp(type, "SPARSE")) { + /* SPARSE extent */ + ret = vmdk_open_sparse(bs, extent_file, bs->open_flags); + if (ret) { + bdrv_delete(extent_file); + return ret; + } } else { /* SPARSE extent, not supported for now */ fprintf(stderr, @@ -552,6 +580,7 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags) return -EINVAL; } if (strcmp(ct, "monolithicFlat") && + strcmp(ct, "twoGbMaxExtentSparse") && strcmp(ct, "twoGbMaxExtentFlat")) { fprintf(stderr, "VMDK: Not supported image type \"%s\""".\n", ct); @@ -574,17 +603,18 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags) static int vmdk_open(BlockDriverState *bs, int flags) { - uint32_t magic; - - if (bdrv_pread(bs->file, 0, &magic, sizeof(magic)) != sizeof(magic)) { - return -EIO; - } + int ret; + BDRVVmdkState *s = bs->opaque; - magic = be32_to_cpu(magic); - if (magic == VMDK3_MAGIC) { - return vmdk_open_vmdk3(bs, flags); - } else if (magic == VMDK4_MAGIC) { - return vmdk_open_vmdk4(bs, flags); + if (vmdk_open_sparse(bs, bs->file, flags) == 0) { + s->desc_offset = 0x200; + /* try to open parent images, if exist */ + ret = vmdk_parent_open(bs); + if (ret) { + return ret; + } + s->parent_cid = vmdk_read_cid(bs, 1); + return 0; } else { return vmdk_open_desc_file(bs, flags); }