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.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=1670510195; cv=none; d=zohomail.com; s=zohoarc; b=crP8hxTbyA0/NRBl+F5e72aN+/TTCy0Ff/6tDP3evcDsroqcr+eOE9V4rMvyqZDE3HNB+X523DwC5rH9qg4CxzrgcHtZD1CRlrap310b3UGhFZ5fxS8iN9A4pulOlVXV47bDYEo0aKpYfkSuxXMjut2cikBdNjsJn9UjhCqB7Rc= 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=Ep1xPPaweyvaXSj73O4q8eyoUVrwbAJfg0n14u1ijWM=; b=ABBX9ikBolgM0PGDWxSrlWurChUr0pRPqxRywpk5ejnHO+gudDJmumm/AYk11+7jnVDQ1NUGBB5vlnJpisLnkAT7RljlXzDh19SMoDJM4LKOtM2YM9p6rjqdYxrp3NnGdqJeKxoiYIHJCfwr9XqdofT6FSvhZbBY1z7SUW0gBR4= 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 1670510195249950.1010906395969; Thu, 8 Dec 2022 06:36:35 -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-277-mHK_0QPvNu68XTeCFB5mmw-1; Thu, 08 Dec 2022 09:36:25 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5FE7B823F10; Thu, 8 Dec 2022 14:35:57 +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 306C4C16932; 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 687401947063; Thu, 8 Dec 2022 14:35:54 +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 303C91947051 for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 74BF120290A5; Thu, 8 Dec 2022 14:35:44 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9D512028E8F; Thu, 8 Dec 2022 14:35:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510191; 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=Ep1xPPaweyvaXSj73O4q8eyoUVrwbAJfg0n14u1ijWM=; b=VWGLA6MEhODGQShkisFivHgRQ5n9FwbIZb2NlYJF2bqRiIUtCPVI356p4qVagXytxjW2kM C1neUq7Tq8txr3/24guVcUvBWBliGpyYO3JIea6LhBqMGtrPPEHal+xWvVPRlDg5w2xORy SkUs1MTj41ANNXB6VnZVar7bAwBQl1g= X-MC-Unique: mHK_0QPvNu68XTeCFB5mmw-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 15/21] meson: remove obsolete check for GET_VLAN_VID_CMD Date: Thu, 8 Dec 2022 14:35:19 +0000 Message-Id: <20221208143525.1731853-16-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.8 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: 1670510203170100003 The ETHTOOL_GFEATURES constant has existed since before Linux moved to git. 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 | 3 --- src/util/virnetdev.c | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 7fb17bf983..f28af30936 100644 --- a/meson.build +++ b/meson.build @@ -650,9 +650,6 @@ symbols =3D [ # Check whether endian provides handy macros. [ 'endian.h', 'htole64' ], =20 - # GET_VLAN_VID_CMD is required for virNetDevGetVLanID - [ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ], - [ 'unistd.h', 'SEEK_HOLE' ], =20 # Check for BSD approach for setting MAC addr diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index a73d624453..9b0f26c1f9 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -959,7 +959,7 @@ virNetDevGetMaster(const char *ifname G_GNUC_UNUSED, #endif /* defined(WITH_LIBNL) */ =20 =20 -#if defined(SIOCGIFVLAN) && defined(WITH_STRUCT_IFREQ) && WITH_DECL_GET_VL= AN_VID_CMD +#if __linux__ int virNetDevGetVLanID(const char *ifname, int *vlanid) { struct vlan_ioctl_args vlanargs =3D { @@ -989,7 +989,7 @@ int virNetDevGetVLanID(const char *ifname, int *vlanid) *vlanid =3D vlanargs.u.VID; return 0; } -#else /* ! SIOCGIFVLAN */ +#else /* ! __linux__ */ int virNetDevGetVLanID(const char *ifname G_GNUC_UNUSED, int *vlanid G_GNUC_UNUSED) { @@ -997,7 +997,7 @@ int virNetDevGetVLanID(const char *ifname G_GNUC_UNUSED, _("Unable to get VLAN on this platform")); return -1; } -#endif /* ! SIOCGIFVLAN */ +#endif /* ! __linux__ */ =20 =20 /** --=20 2.38.1