From nobody Sun Feb 8 16:30:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670510147; cv=none; d=zohomail.com; s=zohoarc; b=MUb/dGsf0jyj1kA3BnRIOSoI74ISPrBHKSD+Ih971gD8XpouJ9RJomabKFPDCv24exKHu6XROb9Cbv04+SkRV23jmW235aPV2r9GBD6KcbVz6Be+ANRAx/BPvd4NkhuYzZHX/Zdvfzug9Oy2QQkDJqJ6ZM9nGVuaj7HZFSyaMfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510147; h=Content-Type:Content-Transfer-Encoding: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=Ga5MEtxHZG7bjHPcp+ll239moFL086bTtsr6UA8fsvI=; b=HLAnGycqKI3ohA79UnpCBh2CqjdnlKPPdsHAOHlXFKDn3FIIPInAY5QG9+/JteiM2TVwcrgcFAJXrUTtvMlVe5YvEmDKSlxNkFDTRvsGhs3VwBxJj04pPmTWjm6eaoiD27uXxu7hEjCYYw1om0Vza0fnH4tu+YOqKD3iH5WQDTQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1670510147958335.8418022498138; Thu, 8 Dec 2022 06:35:47 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-459-aX0SVHShNsmaw_7RX-P75A-1; Thu, 08 Dec 2022 09:35:44 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1E4D2185A7A3; Thu, 8 Dec 2022 14:35:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09FED492B06; Thu, 8 Dec 2022 14:35:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E134C1946A44; Thu, 8 Dec 2022 14:35:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 71A3B1946A41 for ; Thu, 8 Dec 2022 14:35:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 523D720290AE; Thu, 8 Dec 2022 14:35:38 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BC7D201F402; Thu, 8 Dec 2022 14:35:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510147; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ga5MEtxHZG7bjHPcp+ll239moFL086bTtsr6UA8fsvI=; b=UyL02P/dS6hhVHEiXbko+V/fhNM4onMUWl2D1TX91LhPrXH/NYhdWKHChY3G0ZTcZLrJHC sVRXlxwHWaa2SgoI58GxrebF1pSZR7FSOcMKlpx4iS3unpJh7Im3DtLf3DdKlAF14hxVNs xNKd6AFxJHlmKLpZY9wxd3gPnbh8OWk= X-MC-Unique: aX0SVHShNsmaw_7RX-P75A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 08/21] meson: remove obsolete check for ETHTOOL_GFLAGS Date: Thu, 8 Dec 2022 14:35:12 +0000 Message-Id: <20221208143525.1731853-9-berrange@redhat.com> In-Reply-To: <20221208143525.1731853-1-berrange@redhat.com> References: <20221208143525.1731853-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670510148637100002 The ETHTOOL_GFLAGS constant was introduced to Linux in commit 3ae7c0b2e3747b50c3a6c63ebb67469e0a6b3203 Author: Jeff Garzik Date: Wed Aug 15 16:00:51 2007 -0700 [ETHTOOL]: Add ETHTOOL_[GS]FLAGS sub-ioctls This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 --- meson.build | 1 - src/util/virnetdev.c | 20 ++++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index be5d356b88..4703b2c670 100644 --- a/meson.build +++ b/meson.build @@ -654,7 +654,6 @@ symbols =3D [ [ 'linux/ethtool.h', 'ETH_FLAG_NTUPLE' ], [ 'linux/ethtool.h', 'ETH_FLAG_RXHASH' ], [ 'linux/ethtool.h', 'ETH_FLAG_LRO' ], - [ 'linux/ethtool.h', 'ETHTOOL_GFLAGS' ], [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ], [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ], [ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index bf7393b476..f6e2b06102 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3087,24 +3087,22 @@ virNetDevGetEthtoolFeatures(const char *ifname, {ETHTOOL_GGRO, VIR_NET_DEV_FEAT_GGRO}, }; =20 -# if WITH_DECL_ETHTOOL_GFLAGS /* ethtool masks */ struct virNetDevEthtoolFeatureCmd flags[] =3D { -# if WITH_DECL_ETH_FLAG_LRO +# if WITH_DECL_ETH_FLAG_LRO {ETH_FLAG_LRO, VIR_NET_DEV_FEAT_LRO}, -# endif -# if WITH_DECL_ETH_FLAG_TXVLAN +# endif +# if WITH_DECL_ETH_FLAG_TXVLAN {ETH_FLAG_RXVLAN, VIR_NET_DEV_FEAT_RXVLAN}, {ETH_FLAG_TXVLAN, VIR_NET_DEV_FEAT_TXVLAN}, -# endif -# if WITH_DECL_ETH_FLAG_NTUBLE +# endif +# if WITH_DECL_ETH_FLAG_NTUBLE {ETH_FLAG_NTUPLE, VIR_NET_DEV_FEAT_NTUPLE}, -# endif -# if WITH_DECL_ETH_FLAG_RXHASH +# endif +# if WITH_DECL_ETH_FLAG_RXHASH {ETH_FLAG_RXHASH, VIR_NET_DEV_FEAT_RXHASH}, -# endif - }; # endif + }; =20 for (i =3D 0; i < G_N_ELEMENTS(ethtool_cmds); i++) { cmd.cmd =3D ethtool_cmds[i].cmd; @@ -3112,7 +3110,6 @@ virNetDevGetEthtoolFeatures(const char *ifname, ignore_value(virBitmapSetBit(bitmap, ethtool_cmds[i].feat)); } =20 -# if WITH_DECL_ETHTOOL_GFLAGS cmd.cmd =3D ETHTOOL_GFLAGS; if (virNetDevFeatureAvailable(ifname, fd, ifr, &cmd)) { for (i =3D 0; i < G_N_ELEMENTS(flags); i++) { @@ -3120,7 +3117,6 @@ virNetDevGetEthtoolFeatures(const char *ifname, ignore_value(virBitmapSetBit(bitmap, flags[i].feat)); } } -# endif } =20 =20 --=20 2.38.1