From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xiF-0002Di-6l for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0xi9-0003od-BM for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xi8-0003oT-Jr for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:17 -0400 From: Kevin Wolf Date: Tue, 6 Sep 2011 17:39:36 +0200 Message-Id: <1315323586-23840-22-git-send-email-kwolf@redhat.com> In-Reply-To: <1315323586-23840-1-git-send-email-kwolf@redhat.com> References: <1315323586-23840-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 21/31] VMDK: separate vmdk_read_extent/vmdk_write_extent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Fam Zheng 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/vmdk.c | 54 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 9 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 49473f6..106fdbd 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) { -- 1.7.6