From patchwork Mon Jun 27 10:13:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feiran Zheng X-Patchwork-Id: 102130 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 82A01B6F6C for ; Mon, 27 Jun 2011 20:26:59 +1000 (EST) Received: from localhost ([::1]:34600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb91r-0001fp-G2 for incoming@patchwork.ozlabs.org; Mon, 27 Jun 2011 06:26:55 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb8pv-0007c6-Hz for qemu-devel@nongnu.org; Mon, 27 Jun 2011 06:14:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qb8pt-0003CP-Gf for qemu-devel@nongnu.org; Mon, 27 Jun 2011 06:14:35 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:40108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb8ps-0003BT-Qe for qemu-devel@nongnu.org; Mon, 27 Jun 2011 06:14:33 -0400 Received: by mail-iw0-f173.google.com with SMTP id 3so4905538iwn.4 for ; Mon, 27 Jun 2011 03:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=UgEcp+i2s7Xh9d/Z57LLSToXRO5LReisKM+fwuOLNpM=; b=Ebw2LDBPnF/RhwGSoJtLbCOLgBUx5KA+2EkCWxYdVosXRTpP+a/6pJ24Q3K5TcoUiJ NLUfg9Sr4E16injKKpYmzdhAoG6t4/FnY22INayrNraJLKKpKfzpKtI00F7hhd7FcEy4 q51azN1fA1yno/efniHpW51ONh4XFjd6zNcRI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=M6QYYLUaB7x6oKf1g0MgJ/H/lesNkuitqRtBIXOupk5xWekaE6DNcnEXTjW67A80b7 yzexUophxFb7LmNom401RwNjsJAvl6x8OYNw6ourU3MRxvznHihtZZNIMa4WamrpvlA/ X/F6sMssRDBPhObzp+j8QqxsZ4zsv+/XhEFYI= Received: by 10.231.93.73 with SMTP id u9mr5758053ibm.155.1309169669024; Mon, 27 Jun 2011 03:14:29 -0700 (PDT) Received: from localhost.localdomain ([111.187.42.58]) by mx.google.com with ESMTPS id f13sm2996689ibe.10.2011.06.27.03.14.26 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Jun 2011 03:14:28 -0700 (PDT) From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 27 Jun 2011 18:13:16 +0800 Message-Id: <1309169604-29177-5-git-send-email-famcool@gmail.com> X-Mailer: git-send-email 1.7.5.2 In-Reply-To: <1309169604-29177-2-git-send-email-famcool@gmail.com> References: <1309169604-29177-2-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.214.173 Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com Subject: [Qemu-devel] [PATCH v4 04/12] VMDK: separate vmdk_open by format version 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 Separate vmdk_open by subformats to: * vmdk_open_vmdk3 * vmdk_open_vmdk4 Signed-off-by: Fam Zheng --- block/vmdk.c | 195 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 126 insertions(+), 69 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 3bf8980..81c1054 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -443,74 +443,26 @@ static VmdkExtent *vmdk_add_extent(BlockDriverState *bs, return extent; } - -static int vmdk_open(BlockDriverState *bs, int flags) +static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent) { - BDRVVmdkState *s = bs->opaque; - uint32_t magic; - int i; - uint32_t l1_size, l1_entry_sectors; - VmdkExtent *extent = NULL; - - if (bdrv_pread(bs->file, 0, &magic, sizeof(magic)) != sizeof(magic)) - goto fail; - - magic = be32_to_cpu(magic); - if (magic == VMDK3_MAGIC) { - VMDK3Header header; - if (bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)) - != sizeof(header)) { - goto fail; - } - extent = vmdk_add_extent(bs, bs->file, false, - le32_to_cpu(header.disk_sectors), - le32_to_cpu(header.l1dir_offset) << 9, 0, - 1 << 6, 1 << 9, le32_to_cpu(header.granularity)); - } else if (magic == VMDK4_MAGIC) { - VMDK4Header header; - if (bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)) - != sizeof(header)) { - goto fail; - } - l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) - * le64_to_cpu(header.granularity); - l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1) - / l1_entry_sectors; - extent = vmdk_add_extent(bs, bs->file, false, - le64_to_cpu(header.capacity), - le64_to_cpu(header.rgd_offset) << 9, - le64_to_cpu(header.gd_offset) << 9, - l1_size, - le32_to_cpu(header.num_gtes_per_gte), - le64_to_cpu(header.granularity)); - if (extent->l1_entry_sectors <= 0) { - goto fail; - } - // try to open parent images, if exist - if (vmdk_parent_open(bs) != 0) - goto fail; - // write the CID once after the image creation - s->parent_cid = vmdk_read_cid(bs,1); - } else { - goto fail; - } - - /* sum up the total sectors */ - bs->total_sectors = 0; - for (i = 0; i < s->num_extents; i++) { - bs->total_sectors += s->extents[i].sectors; - } + int ret; + int l1_size, i; /* read the L1 table */ l1_size = extent->l1_size * sizeof(uint32_t); extent->l1_table = qemu_malloc(l1_size); - if (bdrv_pread(bs->file, - extent->l1_table_offset, - extent->l1_table, - l1_size) - != l1_size) { + if (!extent->l1_table) { + ret = -ENOMEM; goto fail; } + ret = bdrv_pread(bs->file, + extent->l1_table_offset, + extent->l1_table, + l1_size); + if (ret != l1_size) { + ret = ret < 0 ? ret : -EIO; + goto fail_l1; + } for (i = 0; i < extent->l1_size; i++) { le32_to_cpus(&extent->l1_table[i]); } @@ -525,21 +477,126 @@ static int vmdk_open(BlockDriverState *bs, int flags) goto fail; } for (i = 0; i < extent->l1_size; i++) { + if (!extent->l1_backup_table) { + ret = -ENOMEM; + goto fail_l1; + } + } + ret = bdrv_pread(bs->file, + extent->l1_backup_table_offset, + extent->l1_backup_table, + l1_size); + if (ret != l1_size) { + ret = ret < 0 ? ret : -EIO; + goto fail; + } + for (i = 0; i < extent->l1_size; i++) { le32_to_cpus(&extent->l1_backup_table[i]); } } extent->l2_cache = qemu_malloc(extent->l2_size * L2_CACHE_SIZE * sizeof(uint32_t)); + if (!extent->l2_cache) { + ret = -ENOMEM; + goto fail_l1b; + } return 0; + fail_l1b: + qemu_free(extent->l1_backup_table); + fail_l1: + qemu_free(extent->l1_table); fail: - for (i = 0; i < s->num_extents; i++) { - qemu_free(s->extents[i].l1_backup_table); - qemu_free(s->extents[i].l1_table); - qemu_free(s->extents[i].l2_cache); + return ret; +} + +static int vmdk_open_vmdk3(BlockDriverState *bs, int flags) +{ + int ret; + uint32_t magic; + VMDK3Header header; + VmdkExtent *extent; + BDRVVmdkState *s = bs->opaque; + + ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); + if (ret != sizeof(header)) { + ret = ret < 0 ? ret : -EIO; + goto fail; + } + extent = vmdk_add_extent(bs, bs->file, false, le32_to_cpu(header.disk_sectors), + le32_to_cpu(header.l1dir_offset) << 9, 0, + 1 << 6, 1 << 9, le32_to_cpu(header.granularity)); + ret = vmdk_init_tables(bs, extent); + if (ret) { + return ret; } + return 0; + fail: qemu_free(s->extents); - return -1; + return ret; +} + +static int vmdk_open_vmdk4(BlockDriverState *bs, int flags) +{ + int ret; + uint32_t magic; + uint32_t l1_size, l1_entry_sectors; + VMDK4Header header; + BDRVVmdkState *s = bs->opaque; + VmdkExtent *extent; + + ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); + if (ret != sizeof(header)) { + ret = ret < 0 ? ret : -EIO; + goto fail; + } + l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte) + * le64_to_cpu(header.granularity); + l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1) + / l1_entry_sectors; + extent = vmdk_add_extent(bs, bs->file, false, + le64_to_cpu(header.capacity), + le64_to_cpu(header.rgd_offset) << 9, + le64_to_cpu(header.gd_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; + } + return 0; + fail: + qemu_free(s->extents); + return ret; +} + +static int vmdk_open(BlockDriverState *bs, int flags) +{ + uint32_t magic; + + if (bdrv_pread(bs->file, 0, &magic, sizeof(magic)) != sizeof(magic)) { + return -EIO; + } + + 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); + } else { + return -EINVAL; + } } static int get_whole_cluster(BlockDriverState *bs, @@ -626,11 +683,11 @@ static uint64_t get_cluster_offset(BlockDriverState *bs, if (!l2_offset) { return 0; } - for(i = 0; i < L2_CACHE_SIZE; i++) { + for (i = 0; i < L2_CACHE_SIZE; i++) { if (l2_offset == extent->l2_cache_offsets[i]) { /* increment the hit count */ if (++extent->l2_cache_counts[i] == 0xffffffff) { - for(j = 0; j < L2_CACHE_SIZE; j++) { + for (j = 0; j < L2_CACHE_SIZE; j++) { extent->l2_cache_counts[j] >>= 1; } } @@ -641,7 +698,7 @@ static uint64_t get_cluster_offset(BlockDriverState *bs, /* not found: load a new entry in the least used one */ min_index = 0; min_count = 0xffffffff; - for(i = 0; i < L2_CACHE_SIZE; i++) { + for (i = 0; i < L2_CACHE_SIZE; i++) { if (extent->l2_cache_counts[i] < min_count) { min_count = extent->l2_cache_counts[i]; min_index = i;