From nobody Wed Nov 5 17:59:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496642060295490.6507366993367; Sun, 4 Jun 2017 22:54:20 -0700 (PDT) Received: from localhost ([::1]:59716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHky3-000718-38 for importer@patchew.org; Mon, 05 Jun 2017 01:54:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHkwY-00067B-Rn for qemu-devel@nongnu.org; Mon, 05 Jun 2017 01:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHkwY-0007mj-2S for qemu-devel@nongnu.org; Mon, 05 Jun 2017 01:52:46 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:35297) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHkwX-0007lf-Sw; Mon, 05 Jun 2017 01:52:46 -0400 Received: by mail-pf0-x243.google.com with SMTP id u26so19488203pfd.2; Sun, 04 Jun 2017 22:52:45 -0700 (PDT) Received: from linux.local ([47.247.8.225]) by smtp.gmail.com with ESMTPSA id s68sm961639pfj.33.2017.06.04.22.52.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Jun 2017 22:52:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y0aLdU8eyizcBISOMqtI7Bfk7gF3uIFfg+flRUveKjg=; b=LM1SYtmSPihs9ja8ly7R6ByBCvnltb2ZSkkzYDKM3fvaIkHquvSO5b4gzepf+ghYnI ndi9/zpNF5oSeTE+EIMqQ/vQ3LoWhllPW9E+m67Alu+2kY2nmAY6siUZntLWRIZAL0uT oIAsm6ourYiEcMiwi+k//22a8vhXQmG/OrdJkZ26tvh4W6coeBYG4T701D3vn3iwP2mc EUTbzPb/aK8ZI/LHG8bujChWiUVEWLvpVUJFho7QvHNqfXMhK3iZtU3vjzhwoWFTQQxy qmoltvcD4JOYJ6GHMTLEkNsxZ8Kpwaih90GKQeS0rdZF4GlDWhT66evryuN2ScYI4BNl P2sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=y0aLdU8eyizcBISOMqtI7Bfk7gF3uIFfg+flRUveKjg=; b=ErYV/aR6sIpEbH8TE5JNmdh3lNOkCe4XVwXbyCWWwFx+4ErgoFOoTJ6DIwsbq+FQwt cX++uwSOoFxHvRknxM3pwh6ce3U39wfp6jvBdMyQWSOYDP3xTScggNWKHJFtexGaURX2 RwAaskkztg3f1BxM+bV8njakFawIMYeC6ZV+HMAmFk1/xAO7dvQyBfe+p08F2jhnfvFi 5JIUuIa5hf9MRERZvUM+Fkrn4DqeOIkQKNg+gwEnSXKMrJcZsoNy6+FLcI1EpY2FVje+ 3ugaKgWeNIyYiql+8g5odokPc8vl4991uQ45kQHCXKp5x3RRebTHSdPrrVw+6vlElVGx 9kwQ== X-Gm-Message-State: AODbwcBuPWHOAEf69mL8+X/LoxPBK2MsD6AbpAdfTLAv6nlnHQ0u+TyY NEd5607h/zv5CA== X-Received: by 10.101.76.79 with SMTP id l15mr19598773pgr.86.1496641964993; Sun, 04 Jun 2017 22:52:44 -0700 (PDT) From: Ashijeet Acharya To: famz@redhat.com Date: Mon, 5 Jun 2017 11:23:21 +0530 Message-Id: <1496642007-8309-3-git-send-email-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1496642007-8309-1-git-send-email-ashijeetacharya@gmail.com> References: <1496642007-8309-1-git-send-email-ashijeetacharya@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v5 2/8] vmdk: Rename get_whole_cluster() to vmdk_perform_cow() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org, stefanha@gmail.com, qemu-devel@nongnu.org, mreitz@redhat.com, Ashijeet Acharya , jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Rename the existing function get_whole_cluster() to vmdk_perform_cow() as its sole purpose is to perform COW for the first and the last allocated clusters if needed. Signed-off-by: Ashijeet Acharya Reviewed-by: Fam Zheng --- block/vmdk.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 22be887..73ae786 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1028,8 +1028,8 @@ static void vmdk_refresh_limits(BlockDriverState *bs,= Error **errp) } } =20 -/** - * get_whole_cluster +/* + * vmdk_perform_cow * * Copy backing file's cluster that covers @sector_num, otherwise write ze= ro, * to the cluster at @cluster_sector_num. @@ -1037,13 +1037,18 @@ static void vmdk_refresh_limits(BlockDriverState *b= s, Error **errp) * If @skip_start_sector < @skip_end_sector, the relative range * [@skip_start_sector, @skip_end_sector) is not copied or written, and le= ave * it for call to write user data in the request. + * + * Returns: + * VMDK_OK: on success + * + * VMDK_ERROR: in error cases */ -static int get_whole_cluster(BlockDriverState *bs, - VmdkExtent *extent, - uint64_t cluster_offset, - uint64_t offset, - uint64_t skip_start_bytes, - uint64_t skip_end_bytes) +static int vmdk_perform_cow(BlockDriverState *bs, + VmdkExtent *extent, + uint64_t cluster_offset, + uint64_t offset, + uint64_t skip_start_bytes, + uint64_t skip_end_bytes) { int ret =3D VMDK_OK; int64_t cluster_bytes; @@ -1244,7 +1249,7 @@ static int get_cluster_offset(BlockDriverState *bs, * This problem may occur because of insufficient space on host di= sk * or inappropriate VM shutdown. */ - ret =3D get_whole_cluster(bs, extent, cluster_sector * BDRV_SECTOR= _SIZE, + ret =3D vmdk_perform_cow(bs, extent, cluster_sector * BDRV_SECTOR_= SIZE, offset, skip_start_bytes, skip_end_bytes); if (ret) { return ret; --=20 2.6.2