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 BD584C432C3 for ; Thu, 14 Nov 2019 15:40:14 +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 89946206D5 for ; Thu, 14 Nov 2019 15:40:14 +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="XO1P2M0v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 89946206D5 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]:58856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVHED-00062h-OJ for qemu-devel@archiver.kernel.org; Thu, 14 Nov 2019 10:40:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33633) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVH7p-0000eO-V5 for qemu-devel@nongnu.org; Thu, 14 Nov 2019 10:33:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVH7o-0002F8-Vb for qemu-devel@nongnu.org; Thu, 14 Nov 2019 10:33:37 -0500 Received: from fanzine.igalia.com ([178.60.130.6]:36447) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iVH7o-0002Ex-K5; Thu, 14 Nov 2019 10:33:36 -0500 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=tdF+b9AMdBdriPn8GIUY71DGbLa8wN+gDht7fmUD/Mc=; b=XO1P2M0vMdynENS+O0LzOlqT+hk3BUUwKyEeiUo5LOsTMLYiV4MR238VBUYZBpprZmxZLpxudzrO3XqyIVHIosYq7/aoRwgw09hBksxwq1drGJJD5qJ9YxqEiHiAlo81aoyg7Vi40T3wL+ZBP6nitM9WtxO0rdT3kc+0c0ubwEeEse1m21UGXTkzu0YHTSPYFjFwXIG8yXjPBnjbIIgck+CJ3A4UH2WQ7M/I8qfT16pQH0D5EJ7fTuv7jph4v9OULNR/tjiNRT02vGlp++fTsUYIWvj6FlFvCYB+fAmy7cpeILERSNlAx4wG3cBOhi0dGO7C4fZFFk8FOf7RLNGUBw==; 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 1iVH7n-0005HB-8N; Thu, 14 Nov 2019 16:33:35 +0100 Received: from berto by mail.igalia.com with local (Exim) id 1iVH7n-0003fC-5b; Thu, 14 Nov 2019 16:33:35 +0100 From: Alberto Garcia To: Max Reitz , qemu-devel@nongnu.org Subject: Re: [RFC PATCH v2 16/26] qcow2: Add subcluster support to discard_in_l2_slice() In-Reply-To: <814afb3a-c534-f7f9-2366-65c77756cce6@redhat.com> References: <8a87fb9b6e73f06dfc1a8aa9f3c0b4c01f2c9fbd.1572125022.git.berto@igalia.com> <814afb3a-c534-f7f9-2366-65c77756cce6@redhat.com> User-Agent: Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Thu, 14 Nov 2019 16:33:35 +0100 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 , Anton Nefedov , qemu-block@nongnu.org, Vladimir Sementsov-Ogievskiy , "Denis V . Lunev" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon 04 Nov 2019 04:07:35 PM CET, Max Reitz wrote: >> /* First remove L2 entries */ >> qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); >> - if (!full_discard && s->qcow_version >= 3) { >> + if (has_subclusters(s)) { >> + set_l2_entry(s, l2_slice, l2_index + i, 0); >> + set_l2_bitmap(s, l2_slice, l2_index + i, >> + full_discard ? 0 : QCOW_L2_BITMAP_ALL_ZEROES); > > But only for !full_discard, right? Hence the conditional operator in my patch, maybe you didn't see it? Berto