From patchwork Sun May 24 14:51:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 11567387 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5201A13B4 for ; Sun, 24 May 2020 14:56:53 +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 27E2F2075F for ; Sun, 24 May 2020 14:56:53 +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="F9tNvvuh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27E2F2075F 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcs3Y-0003IP-9T for patchwork-qemu-devel@patchwork.kernel.org; Sun, 24 May 2020 10:56:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcrzy-0002w5-Lc; Sun, 24 May 2020 10:53:10 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:38064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcrzx-0002lv-Hb; Sun, 24 May 2020 10:53:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=uZ7hqhNTymuVQmNbMU9ROSJ5oUnlzFyTKIDHJuQvpHQ=; b=F9tNvvuhRIb5tTccuIeb7TZSDVwCFNZOvVTEE8ww9Dm7tZwNXWBojqAZstsLNYXuxNbtN4rPzGFiNNiTEe2eunClCLAiH55yHdK/REBiTgfncBihDzrIMK+VHwmmS8M78c3B+ECA6mfpzoOZaUaoo8gN5VWeapeqMnmvPOPAaDswrYAiVbOxdR3+7ZY77mUNW3wQvqMdflbyL+JFr7UAxIJgVul9iHD9YEDFqiF6r3zHRJAunF7w5kN+GDYxuejbC/8+9u1y30B4qVrvWr5S2gIKdhrk0hhYB8zIUrSL8W+vjAhl0nN7RVCi8sY43eSBjnZiw333v8/XbblNW/R3Tg==; Received: from [81.0.38.199] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jcrzF-0007Gb-T9; Sun, 24 May 2020 16:52:26 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jcryv-0005Ko-Eu; Sun, 24 May 2020 16:52:05 +0200 From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v6 26/32] qcow2: Clear the L2 bitmap when allocating a compressed cluster Date: Sun, 24 May 2020 16:51:46 +0200 Message-Id: <1094a4fbbb3205de7fd87c5f38c3b97db57f9ccf.1590331741.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/24 10:52:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@nongnu.org, Derek Su , Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Compressed clusters always have the bitmap part of the extended L2 entry set to 0. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- block/qcow2-cluster.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index c8d6e16237..3639dc8057 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -861,6 +861,9 @@ int qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE_COMPRESSED); qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); set_l2_entry(s, l2_slice, l2_index, cluster_offset); + if (has_subclusters(s)) { + set_l2_bitmap(s, l2_slice, l2_index, 0); + } qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice); *host_offset = cluster_offset & s->cluster_offset_mask;