From nobody Sun Feb 8 18:30:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1670510195; cv=none; d=zohomail.com; s=zohoarc; b=mUbcVcZPItnFyzq7dYCkXnrTxGYvhN7Y17wM5YiKBScglfM1GqpulW/63XYlHmWc7X0KFqnARgOB9XQVljz0nTu3Yru0OazUqArk4QD7dc6D9E1b4FZ46SxobIZtr8jmFXgZiHZiCw1xlMRlv/mU7Qbei3cm3gnZzTiVWsGBwrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510195; 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=UL5CsHYyvpZPaNjmWTNFdL5kWP2Ht4u6OKcQxpkIPwQ=; b=ngTvxn80KH/nD/l+ZZs3kcuAdp6Zmxt4OehlXTg5EgsQgq1aoNcPKGXeuO9c6aUddzANKrZihGJ8jIQFeGLw+RHE7huPnSsTaw+GR/bIkHswI3SfnfAxSgBkIbfEbLGeImrjZTqsqUE9uIiuml1TnMofTRIYoTfoZlQd824eoHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1670510195771644.2249799569175; Thu, 8 Dec 2022 06:36:35 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-54-xjSBAsjjPV-4CKGkq7lGKQ-1; Thu, 08 Dec 2022 09:36:27 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 05D841C0896F; Thu, 8 Dec 2022 14:35:58 +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 E007640C6EC3; Thu, 8 Dec 2022 14:35:57 +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 8D2EA194704C; Thu, 8 Dec 2022 14:35:56 +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 46A191947B8D for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 241662024CC0; Thu, 8 Dec 2022 14:35:46 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91B9A200BC58; Thu, 8 Dec 2022 14:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510194; 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=UL5CsHYyvpZPaNjmWTNFdL5kWP2Ht4u6OKcQxpkIPwQ=; b=awCnVCiTPkk/QOB/64UZGAWqEzlrirzPLHvdDE+uZcYTp7oyL2VmxEboau7A23/HZ7uxxa KdENBdA6PYg67rUuPgqlZvmLAv97OFFGFent3ruP25UgXu2NFQH7mUhNiFAI6ddhaOst6y yLAApOJolVj3ujBVgXhY6EGEjUK8xw8= X-MC-Unique: xjSBAsjjPV-4CKGkq7lGKQ-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 17/21] meson: remove obsolete check for DEVLINK_CMD_ESWITCH_GET Date: Thu, 8 Dec 2022 14:35:21 +0000 Message-Id: <20221208143525.1731853-18-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.2 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: 1670510208109100003 The DEVLINK_CMD_ESWITCH_GET constant was introduced to Linux in commit adf200f31c000d707e4afe238ed1d1199e0cce7c Author: Jiri Pirko Date: Thu Feb 9 15:54:33 2017 +0100 devlink: fix the name of eswitch commands 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 | 11 ----------- src/util/virnetdev.c | 6 ++---- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 79f9d47520..30dd797ee5 100644 --- a/meson.build +++ b/meson.build @@ -613,11 +613,6 @@ headers =3D [ 'xlocale.h', ] =20 -if host_machine.system() =3D=3D 'linux' - # check for DEVLINK_CMD_ESWITCH_GET - headers +=3D 'linux/devlink.h' -endif - if host_machine.system() =3D=3D 'freebsd' headers +=3D 'libutil.h' endif @@ -652,12 +647,6 @@ symbols =3D [ =20 if host_machine.system() =3D=3D 'linux' symbols +=3D [ - # check for DEVLINK_CMD_ESWITCH_GET - # Assume DEVLINK_ESWITCH_MODE_SWITCHDEV is also available, as it was - # introudced in kernel 4.8 along with the original spelling of this - # constant (DEVLINK_CMD_ESWITCH_MODE_GET, not supported by libvirt). - [ 'linux/devlink.h', 'DEVLINK_CMD_ESWITCH_GET' ], - # check for VHOST_VSOCK_SET_GUEST_CID [ 'linux/vhost.h', 'VHOST_VSOCK_SET_GUEST_CID' ], =20 diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 9b0f26c1f9..904ea095cf 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -44,6 +44,7 @@ # include # include # include +# include # define VIR_NETDEV_FAMILY AF_UNIX #elif defined(WITH_STRUCT_IFREQ) && defined(AF_LOCAL) # define VIR_NETDEV_FAMILY AF_LOCAL @@ -56,9 +57,6 @@ # include #endif =20 -#if WITH_LINUX_DEVLINK_H -# include -#endif =20 #ifndef IFNAMSIZ # define IFNAMSIZ 16 @@ -3112,7 +3110,7 @@ virNetDevGetEthtoolFeatures(const char *ifname, } =20 =20 -# if defined(WITH_LIBNL) && WITH_DECL_DEVLINK_CMD_ESWITCH_GET +# if defined(WITH_LIBNL) =20 /** * virNetDevGetFamilyId: --=20 2.38.1