From patchwork Mon Oct 9 12:59:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9992945 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 D786060244 for ; Mon, 9 Oct 2017 12:59:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9B5C287C3 for ; Mon, 9 Oct 2017 12:59:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE850287D0; Mon, 9 Oct 2017 12:59:05 +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 6E241287C3 for ; Mon, 9 Oct 2017 12:59:05 +0000 (UTC) Received: from localhost ([::1]:57747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1XeC-0000rO-MP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Oct 2017 08:59:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1Xcs-0000pr-IH for qemu-devel@nongnu.org; Mon, 09 Oct 2017 08:57:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1Xcr-0001ra-NB for qemu-devel@nongnu.org; Mon, 09 Oct 2017 08:57:42 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:35918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1Xcr-0001rP-H2; Mon, 09 Oct 2017 08:57:41 -0400 Received: by mail-pf0-x243.google.com with SMTP id z11so10193717pfk.3; Mon, 09 Oct 2017 05:57:41 -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=SOsS1a9gfdzvuQvETR7oR1HQw20Ak/ij2sOH5vkYgAw=; b=KQwrIs6b/Sy9MWdZUHdJAY/is3LB/KsaSNjIOHGOSLGIeUfMW0Bvxm9DxM7uTp2Rxs sM698GcWcZB/wUDPyKkoSChzNOmsxcgmb9n6c3F9ukpsfcDkY6n9W2BpViJ6FDZNfvo7 SwbhNgquoGtawCu+7uwSeVzfPcMKvBothglM5pVUpyv5G8aPtBTsUqymsQO+05Q6wVHx bBill3eYamd9ICGDfPr0mwkzn1kTbIjTarzk9l4CatqYyFlJjJFbETrx5ddEPGho45M7 DF5Qe8vO7vMNjqpJF5SbjCZDVAkZzYeFGd9NukEBAnrPrnajdajRLZ+p31qkIIaaipj2 1RUw== 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=SOsS1a9gfdzvuQvETR7oR1HQw20Ak/ij2sOH5vkYgAw=; b=mVoQ+hZPk6347keUTR/huq3PYy2gyHrXn6udCcb+1LwfunRmREe8Zt51a6sJVnFpur AEsVn09inEG6IZslQNA/dmpXlk0yP/kbh4ICqMVrRfbMm5ou1fjSBaBjORV9m23DasXP ZfiPRB4QVRUvOATlJ/bM54o4Aa9z6K/ebPX+lee+V/i3LZvton03zeoULSQ+cFwbvlid aO7bD/grIkxUvJme+sRNG2+aTrW+x37ZwCM9gvVKZuzyq/lNV/HYeFqT3UKVxsQDLXM3 R7xLWYVsg1qT4kxY4silz7VpA01jag3fnM+W+f2RzzRSrLjXeK/XH9gzrgqqXK3oNFHw QKAw== X-Gm-Message-State: AMCzsaXfqUCjSGcnYO8YYcg2syTkqzaRlhjn6J3Ff1l8PTBE0SCTIr4j hLoGVwAlJsqkfD6UyB435cA= X-Google-Smtp-Source: AOwi7QDu5Lktsg58gYhz3hJjeNzAGAiRlr7b7gghqoi465eTfY+hRQmZibPHyK7ZW3gXQ5RIwnnlfg== X-Received: by 10.84.232.195 with SMTP id x3mr8989058plm.347.1507553860503; Mon, 09 Oct 2017 05:57:40 -0700 (PDT) Received: from localhost.localdomain ([27.251.197.195]) by smtp.gmail.com with ESMTPSA id d190sm14781283pgc.11.2017.10.09.05.57.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Oct 2017 05:57:40 -0700 (PDT) From: Ashijeet Acharya To: famz@redhat.com Date: Mon, 9 Oct 2017 18:29:33 +0530 Message-Id: <20171009125940.24220-2-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171009125940.24220-1-ashijeetacharya@gmail.com> References: <20171009125940.24220-1-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 v9 1/8] vmdk: Move vmdk_find_offset_in_cluster() to the top 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 Move the existing vmdk_find_offset_in_cluster() function to the top of the driver. Signed-off-by: Ashijeet Acharya Reviewed-by: Fam Zheng --- block/vmdk.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index c665bcc977..e86ca39ff2 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -242,6 +242,18 @@ static void vmdk_free_last_extent(BlockDriverState *bs) s->extents = g_renew(VmdkExtent, s->extents, s->num_extents); } +static inline uint64_t vmdk_find_offset_in_cluster(VmdkExtent *extent, + int64_t offset) +{ + uint64_t extent_begin_offset, extent_relative_offset; + uint64_t cluster_size = extent->cluster_sectors * BDRV_SECTOR_SIZE; + + extent_begin_offset = + (extent->end_sector - extent->sectors) * BDRV_SECTOR_SIZE; + extent_relative_offset = offset - extent_begin_offset; + return extent_relative_offset % cluster_size; +} + /* Return -ve errno, or 0 on success and write CID into *pcid. */ static int vmdk_read_cid(BlockDriverState *bs, int parent, uint32_t *pcid) { @@ -1283,18 +1295,6 @@ static VmdkExtent *find_extent(BDRVVmdkState *s, return NULL; } -static inline uint64_t vmdk_find_offset_in_cluster(VmdkExtent *extent, - int64_t offset) -{ - uint64_t extent_begin_offset, extent_relative_offset; - uint64_t cluster_size = extent->cluster_sectors * BDRV_SECTOR_SIZE; - - extent_begin_offset = - (extent->end_sector - extent->sectors) * BDRV_SECTOR_SIZE; - extent_relative_offset = offset - extent_begin_offset; - return extent_relative_offset % cluster_size; -} - static inline uint64_t vmdk_find_index_in_cluster(VmdkExtent *extent, int64_t sector_num) {