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=1670510226; cv=none; d=zohomail.com; s=zohoarc; b=KKdk0J2g7DzTtLXKEUn3W0wKACEaGcOE7CY3YV7c9E3yoK5Hi2JDI9e/aP6E7fpO4EGa1QRGCCemdeKDLiduQ5C3y10oVkP4ewXAPQ/3pNDGPtUL1JJI6OvotjEIl9j1fjBVZw2U7EISC7adPxwse//4yiYkFNbJDeEFR+z+dhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510226; 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=lxSElJE+07siNj9B8WREtbm4E9HxzmEYNLiToZEQs8k=; b=AwHDfj6hjvPe5wAmnmUwBZfQaUA4rXRDy98o+y+n7eh2RdElHCZ4SfcNffpP0SksJNZvBNJyGp3EgfBxrCpvHYBq/fEKhYX9hCYlfyd1Ymf1ncCtryU0LCx/oLeWTvtVHJkeVhqPrIOT6c7gMlkeKAt/E0W9BUgfMFkLpT4Ujy8= 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 167051022663811.577909676527725; Thu, 8 Dec 2022 06:37:06 -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-265-xUafccG3OLq5oOKCllGuaQ-1; Thu, 08 Dec 2022 09:35:41 -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 8A859857D13; Thu, 8 Dec 2022 14:35:36 +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 76F83492B04; Thu, 8 Dec 2022 14:35:36 +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 3A7D4194704C; Thu, 8 Dec 2022 14:35:36 +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 8EF8A1946A41 for ; Thu, 8 Dec 2022 14:35:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 752412024CC0; Thu, 8 Dec 2022 14:35:35 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD5B32024CC5; Thu, 8 Dec 2022 14:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510225; 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=lxSElJE+07siNj9B8WREtbm4E9HxzmEYNLiToZEQs8k=; b=J3lB9LA0vdj6YDES8Q1Fhu99J7uZz+H8XZmHMC6m0TvIxc9dEgn8LY5/iYHQ4mFJZtjzvC yWoozQnnXwkBQdfRTvQ7UB0R7S/oCWibG2/aXOV5OTUz2NDr/HQivuYDnhLk/9mDsMenkW CBZKHHg/WWa4YJ7flrjjH6BuvS+i55g= X-MC-Unique: xUafccG3OLq5oOKCllGuaQ-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 05/21] netdev: simplify check for ethtool functionality Date: Thu, 8 Dec 2022 14:35:09 +0000 Message-Id: <20221208143525.1731853-6-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: 1670510228642100004 ethtool is a Linux specific feature that has existed since before Linux moved to git. Checking against SIOCETHTOOL + WITH_STRUCT_IFREQ is overkill for our needs. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/util/virnetdev.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 66cfc5d781..c21cf69be1 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -42,6 +42,8 @@ #ifdef __linux__ # include # include +# include +# include # define VIR_NETDEV_FAMILY AF_UNIX #elif defined(WITH_STRUCT_IFREQ) && defined(AF_LOCAL) # define VIR_NETDEV_FAMILY AF_LOCAL @@ -49,11 +51,6 @@ # undef WITH_STRUCT_IFREQ #endif =20 -#if defined(SIOCETHTOOL) && defined(WITH_STRUCT_IFREQ) -# include -# include -#endif - #if WITH_DECL_LINK_ADDR # include # include @@ -2958,7 +2955,7 @@ int virNetDevGetRxFilter(const char *ifname, return ret; } =20 -#if defined(SIOCETHTOOL) && defined(WITH_STRUCT_IFREQ) +#if __linux__ =20 /** * virNetDevRDMAFeature --=20 2.38.1