From patchwork Thu Jun 29 09:23:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9816279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BB1786035F for ; Thu, 29 Jun 2017 09:25:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF3B828653 for ; Thu, 29 Jun 2017 09:25:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A296E286E5; Thu, 29 Jun 2017 09:25:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 489B928653 for ; Thu, 29 Jun 2017 09:25:38 +0000 (UTC) Received: from localhost ([::1]:37932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQVhh-0006Ey-Gc for patchwork-qemu-devel@patchwork.kernel.org; Thu, 29 Jun 2017 05:25:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQVey-0004QP-Ok for qemu-devel@nongnu.org; Thu, 29 Jun 2017 05:22:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQVey-0006kz-1C for qemu-devel@nongnu.org; Thu, 29 Jun 2017 05:22:48 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:36674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQVex-0006kn-Rj; Thu, 29 Jun 2017 05:22:47 -0400 Received: by mail-pf0-x241.google.com with SMTP id z6so12378540pfk.3; Thu, 29 Jun 2017 02:22:47 -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=u+KkZbqHzrqSIsjZiG7ohN8R7M8fP0Gc84QQjiNHZFJACiPjEZwFxr5rjyaNo3+OYr hR74r5yL6GuulDmXXrRhwyN42+Xp7E6x89Z5PwM0k9DjAkbMS6wN/Qt07P6ukCOY5tfu s0UtWWOKa0KtUbOwa6d1RDvZIjPdprWQEY2k7iUNvWQZE66f4wZ1reH9s82D/GyyKi1Z 3J1bBjv+/jziwwY874SL0ajQQ3dfDaPecbmx4MCYGOYzodf3tfJwkSnejp1fICajjGF2 8XCdNBRzD5cebSN0dyh8bP/F+P1CfMRFfFjomRTGsoG9OEWhV7btrk8ULzXydAT7xwYd 5vNg== 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=pGTi1O29+Qh6JbpgoKTf2zfPJM4JdCvSImyPR8JbCh3E46dS2SElcn93HscvOo+Hl6 VQRCBl/32QhvnH4YKwy5bhs+KVrLwIPmR5MFY3we9Tq7mnT2nAZkWRxQ2SRHeQ1YyKr/ P9sYSy+WLrF0TtK2puwuQGSxDbKFiFNsp0zNhwCU7LMS5CalCLQLNSb24Jk9hqJVT+n2 6QK61qK4gVaMS1/EHuVhAllp3iIrbKCqITAWdtjVdWZeF4Tma4qr8BInqiNV9weJSGeO IG9k+wajfNLN8AL/cRuuwGu6+ZxpYV8SPFcBY/0RQJLuAjaw8//8zNvq+3E6r+yOJJw/ GkwA== X-Gm-Message-State: AKS2vOw+24l1D9TKHHOqPmfqSyT2izs9O4bWHF8N7JD7TLQerF8P/9ka lUSslEe/vSdwKA== X-Received: by 10.84.231.134 with SMTP id g6mr6531911plk.241.1498728166875; Thu, 29 Jun 2017 02:22:46 -0700 (PDT) Received: from linux.local ([47.247.15.37]) by smtp.gmail.com with ESMTPSA id u9sm11031203pfg.127.2017.06.29.02.22.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jun 2017 02:22:46 -0700 (PDT) From: Ashijeet Acharya To: famz@redhat.com Date: Thu, 29 Jun 2017 14:53:35 +0530 Message-Id: <1498728221-23979-3-git-send-email-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1498728221-23979-1-git-send-email-ashijeetacharya@gmail.com> References: <1498728221-23979-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::241 Subject: [Qemu-devel] [PATCH v7 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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) } } -/** - * get_whole_cluster +/* + * vmdk_perform_cow * * Copy backing file's cluster that covers @sector_num, otherwise write zero, * to the cluster at @cluster_sector_num. @@ -1037,13 +1037,18 @@ static void vmdk_refresh_limits(BlockDriverState *bs, Error **errp) * If @skip_start_sector < @skip_end_sector, the relative range * [@skip_start_sector, @skip_end_sector) is not copied or written, and leave * 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 = 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 disk * or inappropriate VM shutdown. */ - ret = get_whole_cluster(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, + ret = vmdk_perform_cow(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, offset, skip_start_bytes, skip_end_bytes); if (ret) { return ret;