From nobody Wed Dec 17 21:49:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585322609; cv=none; d=zohomail.com; s=zohoarc; b=Yx+S88dgQzUFTOYJGjYTVQTPE3qqw5u3rILUJKegwCNyn+1Zf6aLOIcJg9/j/IwNFwT6FAyz19BtGWdROQ+vIgZX4GLLMyg2S3DLfz2vuE9h3tw5OAUo/x7rmYmXTbbEq99q3FjiOlkDwwsSHFxpWyHH3MmoNYuPB8jBCi4Rpt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585322609; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9CGBWC4c2QdM3PaT19uZbr2BjwnTY3bkj2aVcI89BVU=; b=Kk6rwc4wfnBFQ0VJnn0Z9IGPsKVyWqZ91aDzFvpP8t0gdV1fa5y8Jzv3VfoBRtNirrcxPCHQ3oHE8ItTrPv/q5O7Uxhg0GdSixRiYcpL4pkMVOQCsAbTUPl2/M8nGGGmA/w+SvK21L4rsaIEBOLz1Io7s2Gt5ieYMcS825H4olk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585322609645214.33609292592075; Fri, 27 Mar 2020 08:23:29 -0700 (PDT) Received: from localhost ([::1]:43005 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqpU-0003iO-EH for importer@patchew.org; Fri, 27 Mar 2020 11:23:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41608) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqmQ-00075s-9Y for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqmP-0005bE-3y for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:18 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:50160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqmO-0005ZJ-UA for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-EEIjfD_9NreaGg1TXIOilA-1; Fri, 27 Mar 2020 11:20:14 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 48AE313F6; Fri, 27 Mar 2020 15:20:13 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F2BE5F709; Fri, 27 Mar 2020 15:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9CGBWC4c2QdM3PaT19uZbr2BjwnTY3bkj2aVcI89BVU=; b=DIX8aE2p2d5IOSfSS/Nfc2PoC34ozZsJQxKv++UbsBvU3PkdHnzjQoNNMcRW6AvaS9bo8F bKs9ol+9AQecWcZVcZKhD/qGFLna5ii0hjkUJBZMxfha+kCue07NFoCVb3SZtb1ooqfMK9 RSiaZ39fg8iYELH5dKAteK0+gyFZ3Lw= X-MC-Unique: EEIjfD_9NreaGg1TXIOilA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 6/6] qcow2: Remove unused fields from BDRVQcow2State Date: Fri, 27 Mar 2020 16:19:50 +0100 Message-Id: <20200327151950.11820-7-kwolf@redhat.com> In-Reply-To: <20200327151950.11820-1-kwolf@redhat.com> References: <20200327151950.11820-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These fields were already removed in commit c3c10f72, but then commit b58deb34 revived them probably due to bad merge conflict resolution. They are still unused, so remove them again. Fixes: b58deb344ddff3b9d8b265bf73a65274767ee5f4 Signed-off-by: Kevin Wolf Message-Id: <20200326170757.12344-1-kwolf@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Kevin Wolf --- block/qcow2.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/qcow2.h b/block/qcow2.h index 0942126232..f4de0a27d5 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -301,9 +301,6 @@ typedef struct BDRVQcow2State { QEMUTimer *cache_clean_timer; unsigned cache_clean_interval; =20 - uint8_t *cluster_cache; - uint8_t *cluster_data; - uint64_t cluster_cache_offset; QLIST_HEAD(, QCowL2Meta) cluster_allocs; =20 uint64_t *refcount_table; --=20 2.20.1