From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D08DC2BA2B for ; Thu, 9 Apr 2020 14:36:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E6AD72078E for ; Thu, 9 Apr 2020 14:36:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="PICBcfYv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6AD72078E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMYHv-0004wF-3H for qemu-devel@archiver.kernel.org; Thu, 09 Apr 2020 10:36:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40824) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMYHG-0004R4-VJ for qemu-devel@nongnu.org; Thu, 09 Apr 2020 10:35:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMYHF-0000YI-SB for qemu-devel@nongnu.org; Thu, 09 Apr 2020 10:35:34 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:47376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jMYHF-0000Us-AV; Thu, 09 Apr 2020 10:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=Bg3qCZvGhY+5NiYRoM3rVYGyGV02LS/J1n0MOtScGEc=; b=PICBcfYvfASJY48csWb1B9PKGYZPJL7OnFKzgI62a+rDRgbpxv9eHPrW9LyCVBCx3/YTeRXqcLbHHWfINzHQ3HfK05eNMJAk8m08V6eiopIz/HKnDApmAF5xGLmCSY0eACHfiW+WySUMtPp2k02LaezuXt3vH3iwVhYgBvq69SX9dKhKiCTR5RhrPVp9Q/pT4/LohoY9APbe9hVPxdBHuQj/hs+tV/JmR5IFZlGq3PBlZJpyiCIluA/F2O8BLiJYsYDT+V8XxSVCDKrYFBLtmPlWTXCYbi3ZCx3UZWohqHXNdKOxJb5C8Rw2zUc/r7KXeji/Fg+fEPwjfS+7rldPAA==; Received: from maestria.local.igalia.com ([192.168.10.14] helo=mail.igalia.com) by fanzine.igalia.com with esmtps (Cipher TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim) id 1jMYH8-0007yK-UC; Thu, 09 Apr 2020 16:35:26 +0200 Received: from berto by mail.igalia.com with local (Exim) id 1jMYH8-0005Qr-KV; Thu, 09 Apr 2020 16:35:26 +0200 From: Alberto Garcia To: Vladimir Sementsov-Ogievskiy , Max Reitz , qemu-devel@nongnu.org Subject: Re: [PATCH v4 02/30] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset() In-Reply-To: <7c21a1f3-e263-9175-2d6d-41aafba85f55@virtuozzo.com> References: <65243debd4a41e1ebd13877c2e6c665759c37b38.1584468723.git.berto@igalia.com> <2f8f3cba-d4e4-49f2-722f-fc6cc96bdd65@redhat.com> <7c21a1f3-e263-9175-2d6d-41aafba85f55@virtuozzo.com> User-Agent: Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Thu, 09 Apr 2020 16:35:26 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 178.60.130.6 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V . Lunev" , Anton Nefedov , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu 09 Apr 2020 09:57:59 AM CEST, Vladimir Sementsov-Ogievskiy wrote: > What about squashing this: > > --- a/block/qcow2-cluster.c > +++ b/block/qcow2-cluster.c > @@ -615,32 +615,34 @@ int qcow2_get_host_offset(BlockDriverState *bs, uint64_t offset, > break; > case QCOW2_CLUSTER_ZERO_ALLOC: > case QCOW2_CLUSTER_NORMAL: > + { > + uint64_t host_cluster_offset = l2_slice & L2E_OFFSET_MASK; > + *host_offset = host_cluster_offset + offset_in_cluster; Ok, that looks good (I'll put the brace on the 'case' line though). Berto