From nobody Fri Nov 14 05:13:11 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=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585242576; cv=none; d=zohomail.com; s=zohoarc; b=MI7I+HRM6V+nswy79S7hDLMeJfvR045ajq2vNf5FVrPqOpAvfZLMYY1wbfPOHQ0PCvg8zxOHEwIw0rEHxmfCVzQtyVbXegfhn0PsHk7lw0c8caLtRx/LV6w0A7Xh7WriApMT7PHmENVwzWVWj7BWVn1FwmItJ8E0kW+bTASqX9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585242576; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=yzwQQY8P0vqqev25+cuAzypnx4ZAy2PAsI1HzOaH5SA=; b=dMzVEShB7wHjlIGE2N+Qz3V90h9zYoZ41o3zzL7ds+O6FddiLkFLweSyQ4PxbxZJO1QbE7Ye1FRfKj2Yz6pyXx3UR3FSisl1GKzqrF06/favjzdtq5bdYjSh4lxQLaAejDchHuVC+z53zA8h60+nqZKVKQOTY0NKeDYgDvcBtOA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1585242576783895.1769455693276; Thu, 26 Mar 2020 10:09:36 -0700 (PDT) Received: from localhost ([::1]:56786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHW0c-0002Ze-SF for importer@patchew.org; Thu, 26 Mar 2020 13:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38818) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHVzO-0001aa-Ag for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:08:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHVzM-0003F0-FD for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:08:17 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:47377) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHVzM-0003Dw-80 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:08:16 -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-195-bdC00XYhPi25LjN-dAk3zQ-1; Thu, 26 Mar 2020 13:08:13 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B9D0800D5C; Thu, 26 Mar 2020 17:08:12 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-112-205.ams2.redhat.com [10.36.112.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79433101D482; Thu, 26 Mar 2020 17:08:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585242495; 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; bh=yzwQQY8P0vqqev25+cuAzypnx4ZAy2PAsI1HzOaH5SA=; b=fCKuqMy0OzmupXbXknyZxK+3rer4ax276Q1eYjIL+O4nudY/ZmUjtclW2Wt7EBP8xrUr01 WlR8whQjDvo/1EsCP/Iol8tTUwJx2RwoyeK+cxM4rfSiJBrvWUrjK9hYpTd7Rx4PQGTF/F CrgQKye1z73Sfd0WxZ4Bs+sEgKumf74= X-MC-Unique: bdC00XYhPi25LjN-dAk3zQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH] qcow2: Remove unused fields from BDRVQcow2State Date: Thu, 26 Mar 2020 18:07:57 +0100 Message-Id: <20200326170757.12344-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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] [fuzzy] X-Received-From: 216.205.24.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, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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