From nobody Tue Oct 28 04:13:16 2025 Delivered-To: importer@patchew.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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1748426840; cv=none; d=zohomail.com; s=zohoarc; b=gnvSaRYHZnbTHYWxS6o4x+5mWzUvbYeNywei1bD0+ak3fLHkcj1XZOm57bVU6JBeXM+o3WIQdDz/6FIONR6BSWb9Pieqj2Um8PJGNbl550q0VjFkd7IBO1w9oUyZ/N6Pj35Z0yRwMfJgzNU2cpShPaje8WNgBpnp1htCyH/rX5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748426840; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fDA/okgTdwBkuJfM2akfszXR3E9almYZhidqyI4nBwI=; b=CrqDZGDh7U81ap9aRyAXSbaGtXQYWfABT4b3ePhd9O9YBURU41otbGrgYs+uS06EhTOnoxXTfJYwSbqlXLYTvprM+hZLGO4R6SoMmWKkB3C/J/1XV9dhXpkeWwVMxif7vroItxiS9wK0k/IntHuVN2EorC0ELe1oVPh3yWjlliM= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748426840564108.7827439163674; Wed, 28 May 2025 03:07:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKDgj-0006Sh-5K; Wed, 28 May 2025 06:07:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKDg0-0004CD-BG for qemu-devel@nongnu.org; Wed, 28 May 2025 06:06:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKDfh-0007Eb-88 for qemu-devel@nongnu.org; Wed, 28 May 2025 06:06:22 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-533-ZGw3g00AO3eoj7bgJVbMUw-1; Wed, 28 May 2025 06:05:57 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CEC16195608A; Wed, 28 May 2025 10:05:56 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.34.110]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9ECA3180049D; Wed, 28 May 2025 10:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748426761; 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=fDA/okgTdwBkuJfM2akfszXR3E9almYZhidqyI4nBwI=; b=GD5xh+/SDriuwfKJugCHOyHt0XFr1t2R/IsVno1BNJVMOHQXSy1SSlMPI/9byozK4YfakM ZVzQQpW6+A3hUrzYfXfNro1muTaeE47ibaIpgM9SU08J2n7fZ4KfejuA9g9/SLH6vfmbDO bgWRvkmqKu1lmjb6x/gWFS+KRHOuxK8= X-MC-Unique: ZGw3g00AO3eoj7bgJVbMUw-1 X-Mimecast-MFC-AGG-ID: ZGw3g00AO3eoj7bgJVbMUw_1748426756 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Zhao Liu Subject: [PULL 14/27] hw/net/e1000: Remove unused E1000_FLAG_MAC flag Date: Wed, 28 May 2025 12:04:54 +0200 Message-ID: <20250528100507.313906-15-thuth@redhat.com> In-Reply-To: <20250528100507.313906-1-thuth@redhat.com> References: <20250528100507.313906-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) DKIMWL_WL_HIGH=-2.907, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UPPERCASE_50_75=0.008 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1748426842686116600 From: Philippe Mathieu-Daud=C3=A9 E1000_FLAG_MAC was only used by the hw_compat_2_4[] array, via the 'extra_mac_registers=3Doff' property. We removed all machines using that array, lets remove all the code around E1000_FLAG_MAC, including the MAC_ACCESS_FLAG_NEEDED enum, similarly to commit fa4ec9ffda7 ("e1000: remove old compatibility code"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Zhao Liu Message-ID: <20250512083948.39294-7-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/net/e1000.c | 95 ++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 54 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index cba4999e6d0..a80a7b0cdb4 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -127,10 +127,8 @@ struct E1000State_st { QEMUTimer *flush_queue_timer; =20 /* Compatibility flags for migration to/from qemu 1.3.0 and older */ -#define E1000_FLAG_MAC_BIT 2 #define E1000_FLAG_TSO_BIT 3 #define E1000_FLAG_VET_BIT 4 -#define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT) #define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT) #define E1000_FLAG_VET (1 << E1000_FLAG_VET_BIT) =20 @@ -1212,52 +1210,51 @@ enum { NWRITEOPS =3D ARRAY_SIZE(macreg_writeops) }; =20 enum { MAC_ACCESS_PARTIAL =3D 1, MAC_ACCESS_FLAG_NEEDED =3D 2 }; =20 -#define markflag(x) ((E1000_FLAG_##x << 2) | MAC_ACCESS_FLAG_NEEDED) /* In the array below the meaning of the bits is: [f|f|f|f|f|f|n|p] * f - flag bits (up to 6 possible flags) * n - flag needed - * p - partially implenented */ + * p - partially implemented */ static const uint8_t mac_reg_access[0x8000] =3D { - [IPAV] =3D markflag(MAC), [WUC] =3D markflag(MAC), - [IP6AT] =3D markflag(MAC), [IP4AT] =3D markflag(MAC), - [FFVT] =3D markflag(MAC), [WUPM] =3D markflag(MAC), - [ECOL] =3D markflag(MAC), [MCC] =3D markflag(MAC), - [DC] =3D markflag(MAC), [TNCRS] =3D markflag(MAC), - [RLEC] =3D markflag(MAC), [XONRXC] =3D markflag(MAC), - [XOFFTXC] =3D markflag(MAC), [RFC] =3D markflag(MAC), - [TSCTFC] =3D markflag(MAC), [MGTPRC] =3D markflag(MAC), - [WUS] =3D markflag(MAC), [AIT] =3D markflag(MAC), - [FFLT] =3D markflag(MAC), [FFMT] =3D markflag(MAC), - [SCC] =3D markflag(MAC), [FCRUC] =3D markflag(MAC), - [LATECOL] =3D markflag(MAC), [COLC] =3D markflag(MAC), - [SEQEC] =3D markflag(MAC), [CEXTERR] =3D markflag(MAC), - [XONTXC] =3D markflag(MAC), [XOFFRXC] =3D markflag(MAC), - [RJC] =3D markflag(MAC), [RNBC] =3D markflag(MAC), - [MGTPDC] =3D markflag(MAC), [MGTPTC] =3D markflag(MAC), - [RUC] =3D markflag(MAC), [ROC] =3D markflag(MAC), - [GORCL] =3D markflag(MAC), [GORCH] =3D markflag(MAC), - [GOTCL] =3D markflag(MAC), [GOTCH] =3D markflag(MAC), - [BPRC] =3D markflag(MAC), [MPRC] =3D markflag(MAC), - [TSCTC] =3D markflag(MAC), [PRC64] =3D markflag(MAC), - [PRC127] =3D markflag(MAC), [PRC255] =3D markflag(MAC), - [PRC511] =3D markflag(MAC), [PRC1023] =3D markflag(MAC), - [PRC1522] =3D markflag(MAC), [PTC64] =3D markflag(MAC), - [PTC127] =3D markflag(MAC), [PTC255] =3D markflag(MAC), - [PTC511] =3D markflag(MAC), [PTC1023] =3D markflag(MAC), - [PTC1522] =3D markflag(MAC), [MPTC] =3D markflag(MAC), - [BPTC] =3D markflag(MAC), - - [TDFH] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFT] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFHS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFTS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFPC] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFH] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFT] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFHS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFTS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFPC] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [PBM] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, + [IPAV] =3D MAC_ACCESS_FLAG_NEEDED, [WUC] =3D MAC_ACCESS_FLAG= _NEEDED, + [IP6AT] =3D MAC_ACCESS_FLAG_NEEDED, [IP4AT] =3D MAC_ACCESS_FLAG= _NEEDED, + [FFVT] =3D MAC_ACCESS_FLAG_NEEDED, [WUPM] =3D MAC_ACCESS_FLAG= _NEEDED, + [ECOL] =3D MAC_ACCESS_FLAG_NEEDED, [MCC] =3D MAC_ACCESS_FLAG= _NEEDED, + [DC] =3D MAC_ACCESS_FLAG_NEEDED, [TNCRS] =3D MAC_ACCESS_FLAG= _NEEDED, + [RLEC] =3D MAC_ACCESS_FLAG_NEEDED, [XONRXC] =3D MAC_ACCESS_FLAG= _NEEDED, + [XOFFTXC] =3D MAC_ACCESS_FLAG_NEEDED, [RFC] =3D MAC_ACCESS_FLAG= _NEEDED, + [TSCTFC] =3D MAC_ACCESS_FLAG_NEEDED, [MGTPRC] =3D MAC_ACCESS_FLAG= _NEEDED, + [WUS] =3D MAC_ACCESS_FLAG_NEEDED, [AIT] =3D MAC_ACCESS_FLAG= _NEEDED, + [FFLT] =3D MAC_ACCESS_FLAG_NEEDED, [FFMT] =3D MAC_ACCESS_FLAG= _NEEDED, + [SCC] =3D MAC_ACCESS_FLAG_NEEDED, [FCRUC] =3D MAC_ACCESS_FLAG= _NEEDED, + [LATECOL] =3D MAC_ACCESS_FLAG_NEEDED, [COLC] =3D MAC_ACCESS_FLAG= _NEEDED, + [SEQEC] =3D MAC_ACCESS_FLAG_NEEDED, [CEXTERR] =3D MAC_ACCESS_FLAG= _NEEDED, + [XONTXC] =3D MAC_ACCESS_FLAG_NEEDED, [XOFFRXC] =3D MAC_ACCESS_FLAG= _NEEDED, + [RJC] =3D MAC_ACCESS_FLAG_NEEDED, [RNBC] =3D MAC_ACCESS_FLAG= _NEEDED, + [MGTPDC] =3D MAC_ACCESS_FLAG_NEEDED, [MGTPTC] =3D MAC_ACCESS_FLAG= _NEEDED, + [RUC] =3D MAC_ACCESS_FLAG_NEEDED, [ROC] =3D MAC_ACCESS_FLAG= _NEEDED, + [GORCL] =3D MAC_ACCESS_FLAG_NEEDED, [GORCH] =3D MAC_ACCESS_FLAG= _NEEDED, + [GOTCL] =3D MAC_ACCESS_FLAG_NEEDED, [GOTCH] =3D MAC_ACCESS_FLAG= _NEEDED, + [BPRC] =3D MAC_ACCESS_FLAG_NEEDED, [MPRC] =3D MAC_ACCESS_FLAG= _NEEDED, + [TSCTC] =3D MAC_ACCESS_FLAG_NEEDED, [PRC64] =3D MAC_ACCESS_FLAG= _NEEDED, + [PRC127] =3D MAC_ACCESS_FLAG_NEEDED, [PRC255] =3D MAC_ACCESS_FLAG= _NEEDED, + [PRC511] =3D MAC_ACCESS_FLAG_NEEDED, [PRC1023] =3D MAC_ACCESS_FLAG= _NEEDED, + [PRC1522] =3D MAC_ACCESS_FLAG_NEEDED, [PTC64] =3D MAC_ACCESS_FLAG= _NEEDED, + [PTC127] =3D MAC_ACCESS_FLAG_NEEDED, [PTC255] =3D MAC_ACCESS_FLAG= _NEEDED, + [PTC511] =3D MAC_ACCESS_FLAG_NEEDED, [PTC1023] =3D MAC_ACCESS_FLAG= _NEEDED, + [PTC1522] =3D MAC_ACCESS_FLAG_NEEDED, [MPTC] =3D MAC_ACCESS_FLAG= _NEEDED, + [BPTC] =3D MAC_ACCESS_FLAG_NEEDED, + + [TDFH] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [TDFT] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [TDFHS] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [TDFTS] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [TDFPC] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFH] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFT] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFHS] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFTS] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFPC] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [PBM] =3D MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, }; =20 static void @@ -1419,13 +1416,6 @@ static int e1000_tx_tso_post_load(void *opaque, int = version_id) return 0; } =20 -static bool e1000_full_mac_needed(void *opaque) -{ - E1000State *s =3D opaque; - - return chkflag(MAC); -} - static bool e1000_tso_state_needed(void *opaque) { E1000State *s =3D opaque; @@ -1451,7 +1441,6 @@ static const VMStateDescription vmstate_e1000_full_ma= c_state =3D { .name =3D "e1000/full_mac_state", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D e1000_full_mac_needed, .fields =3D (const VMStateField[]) { VMSTATE_UINT32_ARRAY(mac_reg, E1000State, 0x8000), VMSTATE_END_OF_LIST() @@ -1679,8 +1668,6 @@ static void pci_e1000_realize(PCIDevice *pci_dev, Err= or **errp) =20 static const Property e1000_properties[] =3D { DEFINE_NIC_PROPERTIES(E1000State, conf), - DEFINE_PROP_BIT("extra_mac_registers", E1000State, - compat_flags, E1000_FLAG_MAC_BIT, true), DEFINE_PROP_BIT("migrate_tso_props", E1000State, compat_flags, E1000_FLAG_TSO_BIT, true), DEFINE_PROP_BIT("init-vet", E1000State, --=20 2.49.0