From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrtXG-0004TG-8h for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrtXE-000203-Lm for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:34 -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 1QrtXE-0001yO-GK for qemu-devel@nongnu.org; Fri, 12 Aug 2011 11:20:32 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so6748610pzk.29 for ; Fri, 12 Aug 2011 08:20:32 -0700 (PDT) From: Fam Zheng Date: Fri, 12 Aug 2011 23:19:29 +0800 Message-Id: <1313162374-13147-4-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 3/8] VMDK: separate vmdk_read_extent/vmdk_write_extent 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 Factor out read/write extent code, since there will be more things to take care of once reading/writing compressed clusters is introduced. Signed-off-by: Fam Zheng --- block/vmdk.c | 54 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 9 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index ab15840..466d0c2 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -833,6 +833,43 @@ static int vmdk_is_allocated(BlockDriverState *bs, int64_t sector_num, return ret; } +static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset, + int64_t offset_in_cluster, const uint8_t *buf, + int nb_sectors, int64_t sector_num) +{ + int ret; + const uint8_t *write_buf = buf; + int write_len = nb_sectors * 512; + + ret = bdrv_pwrite(extent->file, + cluster_offset + offset_in_cluster, + write_buf, + write_len); + if (ret != write_len) { + ret = ret < 0 ? ret : -EIO; + goto out; + } + ret = 0; + out: + return ret; +} + +static int vmdk_read_extent(VmdkExtent *extent, int64_t cluster_offset, + int64_t offset_in_cluster, uint8_t *buf, + int nb_sectors) +{ + int ret; + + ret = bdrv_pread(extent->file, + cluster_offset + offset_in_cluster, + buf, nb_sectors * 512); + if (ret == nb_sectors * 512) { + return 0; + } else { + return -EIO; + } +} + static int vmdk_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors) { @@ -869,10 +906,10 @@ static int vmdk_read(BlockDriverState *bs, int64_t sector_num, memset(buf, 0, 512 * n); } } else { - ret = bdrv_pread(extent->file, - cluster_offset + index_in_cluster * 512, - buf, n * 512); - if (ret < 0) { + ret = vmdk_read_extent(extent, + cluster_offset, index_in_cluster * 512, + buf, n); + if (ret) { return ret; } } @@ -921,11 +958,10 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num, n = nb_sectors; } - ret = bdrv_pwrite(extent->file, - cluster_offset + index_in_cluster * 512, - buf, - n * 512); - if (ret < 0) { + ret = vmdk_write_extent(extent, + cluster_offset, index_in_cluster * 512, + buf, n, sector_num); + if (ret) { return ret; } if (m_data.valid) {