From nobody Fri May 17 08:25:14 2024 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=1670510163; cv=none; d=zohomail.com; s=zohoarc; b=dQv9/SKDTRug3oD4iGWxx7BUn2OCb5jR/Vqf17l9EYRk8Phs3ZHaHVez5CeIq8tzChRm+otdOZZrjcp0t9Vlc52/V67I3E8BSH525rtj5bCexQ2GCvQC74zAotRl4GRYnCfVSY99NoMYVPszjEN4mNnmFPyHzMLUZgA2zEVPJPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510163; 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=QmiElBveNgbTPt+Cig7PNj1FULdxLj4pZoarY9qivL8=; b=iWZ0GvvDjjluDMCYGn9XuzXzyyS2VT5ubSrtFtg6OWv4ZsMxYTJo2OmhQppqL2QANXNsEgK8Eta6ewdgMw4T4dBcVG6Q/AD+PcdBz+amxyjH6A4ikja3Gh0x5C5nmj4QV87/zkncupFQxFJA4POAtvYOFZPQEtr1A/3xC0iIABU= 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 1670510163785761.7926316351968; Thu, 8 Dec 2022 06:36:03 -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-65-4es9gYufMEyXvLKbWIVuhw-1; Thu, 08 Dec 2022 09:35:36 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E061F2A5956F; Thu, 8 Dec 2022 14:35:32 +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 B8BAD2166B2C; Thu, 8 Dec 2022 14:35:32 +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 6600F1946A68; Thu, 8 Dec 2022 14:35:32 +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 BEF8D1946A41 for ; Thu, 8 Dec 2022 14:35:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B0EF22024CC5; Thu, 8 Dec 2022 14:35:30 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 228892024CC0; Thu, 8 Dec 2022 14:35:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510162; 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=QmiElBveNgbTPt+Cig7PNj1FULdxLj4pZoarY9qivL8=; b=ZPdPi7Tv60UZjGAg0q+/WsCAU3i0P9/aB4C/EEO4LK7JZdn+Ti5q4sX3hStEnq+SmUmJJ0 6Fv3AAQXFeu1T54sS2sivArjPAw3tFSg+8IGipmLsMYi0TopJNH/ZM2dX8DpHYLDM9au94 CDeo+mTh14iFjvVPIRY/G0tdg4TGKM8= X-MC-Unique: 4es9gYufMEyXvLKbWIVuhw-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 01/21] meson: remove obsolete check for LOOP_CTL_GET_FREE Date: Thu, 8 Dec 2022 14:35:05 +0000 Message-Id: <20221208143525.1731853-2-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.6 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: 1670510164713100001 The LOOP_CTL_GET_FREE constant was introduced to Linux in commit 770fe30a46a12b6fb6b63fbe1737654d28e84844 Author: Kay Sievers Date: Sun Jul 31 22:08:04 2011 +0200 loop: add management interface for on-demand device allocation This is old enough that all our supported platforms can be assumed to have this feature. As a plus point, this meson check is going to start failing with future GCC. It fails to set _GNU_SOURCE, thus 'unshare' is not defined by the header, and its relying on an implicit function decl. For added fun this whole meson check was semantically insane because LOOP_CTL_GET_FREE is not a valid arg to unshare(). Fixes https://fedoraproject.org/wiki/Toolchain/PortingToModernC Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 13 ------------- src/util/virfile.c | 5 ----- 2 files changed, 18 deletions(-) diff --git a/meson.build b/meson.build index f9834a36c2..22679db85d 100644 --- a/meson.build +++ b/meson.build @@ -1541,19 +1541,6 @@ void main(void) { elif get_option('driver_lxc').enabled() error('Required kernel features for LXC were not found') endif - - lxc_get_free_code =3D ''' -#include -#include -#include - -void main(void) { - unshare(!(LOOP_CTL_GET_FREE)); -} - ''' - if cc.compiles(lxc_get_free_code) - conf.set('WITH_DECL_LOOP_CTL_GET_FREE', 1) - endif elif get_option('driver_lxc').enabled() error('linux and remote_driver are required for LXC') endif diff --git a/src/util/virfile.c b/src/util/virfile.c index ec40c04b1f..cef9f9979a 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -750,8 +750,6 @@ int virFileUpdatePerm(const char *path, =20 #if defined(__linux__) && WITH_DECL_LO_FLAGS_AUTOCLEAR =20 -# if WITH_DECL_LOOP_CTL_GET_FREE - /* virFileLoopDeviceOpenLoopCtl() returns -1 when a real failure has occur= red * while in the process of allocating or opening the loop device. On succ= ess * we return 0 and modify the fd to the appropriate file descriptor. @@ -795,7 +793,6 @@ static int virFileLoopDeviceOpenLoopCtl(char **dev_name= , int *fd) *dev_name =3D looppath; return 0; } -# endif /* WITH_DECL_LOOP_CTL_GET_FREE */ =20 static int virFileLoopDeviceOpenSearch(char **dev_name) { @@ -864,7 +861,6 @@ static int virFileLoopDeviceOpen(char **dev_name) { int loop_fd =3D -1; =20 -# if WITH_DECL_LOOP_CTL_GET_FREE if (virFileLoopDeviceOpenLoopCtl(dev_name, &loop_fd) < 0) return -1; =20 @@ -872,7 +868,6 @@ static int virFileLoopDeviceOpen(char **dev_name) =20 if (loop_fd >=3D 0) return loop_fd; -# endif /* WITH_DECL_LOOP_CTL_GET_FREE */ =20 /* Without the loop control device we just use the old technique. */ loop_fd =3D virFileLoopDeviceOpenSearch(dev_name); --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510141; cv=none; d=zohomail.com; s=zohoarc; b=lZF00tGXhbxP4GR9/z3ys1Ajc9/Zk8TtRqNoVfoXYTxskicQg1tHAMT8WSn/yz2U10QvxMPw2RWo28Dt4leLWFX5e6eE1l8E+yRC3128rO6GpfxyA3uSF1Ss59L8n//7pMXlWVqC05/PeuhI7NCR/Xqre9QkQqqAc91Y9GiCCU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510141; 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=dmpl0sdOvV4Dr66nHnej9p5dy/j8g7aYbJ5M0RTwj+0=; b=KmFuRkoENU//CDAhyws3kDCYFS5iz9ila2I2Pr81NiPkhamEX0o4cJV95AQyuouZcWGZM/prxEXEFheZKx1ZkQEep2MLOdZHIf+j05S9yPaV9GO+D+1uu35hxBLoLjDx2qVCS2xIu6NPx4Mh1L8G19IgxhvIL0UWmjcLew40JMc= 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 167051014135384.28116974862712; Thu, 8 Dec 2022 06:35:41 -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-114-JCDSNYzAMzGzyh-mkVtCeQ-1; Thu, 08 Dec 2022 09:35:36 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7BFAD1C06911; Thu, 8 Dec 2022 14:35:33 +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 688481121333; Thu, 8 Dec 2022 14:35:33 +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 78615194704D; Thu, 8 Dec 2022 14:35:32 +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 94011194704A for ; Thu, 8 Dec 2022 14:35:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 869572024CC0; Thu, 8 Dec 2022 14:35:31 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1BA12024CC5; Thu, 8 Dec 2022 14:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510140; 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=dmpl0sdOvV4Dr66nHnej9p5dy/j8g7aYbJ5M0RTwj+0=; b=CIn5hQENXMiPb1raaKd2qQ0m5H60G6f2CR9AkxfIdeRtq2NVh75DzxARAiyv+Rnvb+JW9Z /Q/8Xg1yv0i/gXZoWw9rvcyIJAeC2bJDB4oOJcVtUb/FfnEwY2iEmoN7G1y1CcLEOby6Hr wtZAI/D4u4UpEsZHbVyKKfEyQJi3Cbw= X-MC-Unique: JCDSNYzAMzGzyh-mkVtCeQ-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 02/21] meson: remove obsolete check for EPOLL_CLOEXEC Date: Thu, 8 Dec 2022 14:35:06 +0000 Message-Id: <20221208143525.1731853-3-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.3 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: 1670510142567100003 The EPOLL_CLOEXEC constant was introduced to Linux in commit a0998b50c3f0b8fdd265c63e0032f86ebe377dbf Author: Ulrich Drepper Date: Wed Jul 23 21:29:27 2008 -0700 flag parameters: epoll_create This is old enough that all our supported platforms can be assumed to have this feature. For added fun this whole meson check was semantically insane because EPOLL_CLOEXEC is not a valid arg to unshare(). Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 22679db85d..f313767cfe 100644 --- a/meson.build +++ b/meson.build @@ -1532,7 +1532,7 @@ if not get_option('driver_lxc').disabled() and host_m= achine.system() =3D=3D 'linux' #include =20 void main(void) { - unshare(!(LO_FLAGS_AUTOCLEAR + EPOLL_CLOEXEC)); + unshare(!(LO_FLAGS_AUTOCLEAR)); } ''' if cc.compiles(lxc_support_code, name: 'lxc support', args: '-D_GNU_SOUR= CE') --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510141; cv=none; d=zohomail.com; s=zohoarc; b=gRc5SwfbA7QnVead9xsSY2g8O7PzfIsU8eglTPDRoaKuKAbDiyw8fP0vewRycRyyHjqsbuA1By0KrOYaVAaPTcoRy+7nVjYd8s5gYReeRO5Dyxm7UDfIEudaZGqtb873BfFE14EvhLp6i/FKjqb5rnwuQ46rJCcCera43eKkv3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510141; 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=dEIisNgkr1h6CjQrPCARPZcYQR7hc7sG6MaxCiqUyNY=; b=ePKHKzn0zJ1gJKWh2nK5jcEL+bRlr9Mq0XhJU0wgVlx6Ad8W7buKg+qoVS5Ic0sZUbrp2TawcKLi5ISxf/KyNTPmf6yXXHOAvoOMgNqL7v+nv9d7yqJX2SeOXAjrwDuKsbZqpJ5ZJArI114+peJOijr8uHic0VKbfxF0783P4GE= 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 16705101413321018.9011686373465; Thu, 8 Dec 2022 06:35:41 -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-342-TuAT67vHMOeFjM7z9KY9YQ-1; Thu, 08 Dec 2022 09:35:38 -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 9ECD6185A794; Thu, 8 Dec 2022 14:35:34 +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 8AEED492B05; Thu, 8 Dec 2022 14:35:34 +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 6CA9C1946A44; Thu, 8 Dec 2022 14:35:34 +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 B8C14194704A for ; Thu, 8 Dec 2022 14:35:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9F88C202903F; Thu, 8 Dec 2022 14:35:33 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id C91462024CC5; Thu, 8 Dec 2022 14:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510140; 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=dEIisNgkr1h6CjQrPCARPZcYQR7hc7sG6MaxCiqUyNY=; b=EcHdF8NsReEAfXuY/MeNzba84Qqp/Phva/C/Xr90apNMOFfAEl7zkv0nXIOVrRrV9tMwJ6 4l1WMiYDa5PHxvm/wwr6bExk2dATVLSdKxFDubPS4NjbEx56/ApW0tLMVSVzq/CUpeDMdL 8n/teDh+gGtz5sQ7hJdF1WdOwCmo27M= X-MC-Unique: TuAT67vHMOeFjM7z9KY9YQ-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 03/21] meson: remove obsolete check for LO_FLAGS_AUTOCLEAR Date: Thu, 8 Dec 2022 14:35:07 +0000 Message-Id: <20221208143525.1731853-4-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: 1670510142588100004 The LO_FLAGS_AUTOCLEAR constant was introduced to Linux in commit 96c5865559cee0f9cbc5173f3c949f6ce3525581 Author: David Woodhouse Date: Wed Feb 6 01:36:27 2008 -0800 Allow auto-destruction of loop devices This is old enough that all our supported platforms can be assumed to have this feature. For added fun this whole meson check was semantically insane because EPOLL_CLOEXEC is not a valid arg to unshare(). Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 3 +-- src/util/virfile.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index f313767cfe..212c3cfafb 100644 --- a/meson.build +++ b/meson.build @@ -1532,12 +1532,11 @@ if not get_option('driver_lxc').disabled() and host= _machine.system() =3D=3D 'linux' #include =20 void main(void) { - unshare(!(LO_FLAGS_AUTOCLEAR)); + unshare(1); } ''' if cc.compiles(lxc_support_code, name: 'lxc support', args: '-D_GNU_SOUR= CE') conf.set('WITH_LXC', 1) - conf.set('WITH_DECL_LO_FLAGS_AUTOCLEAR', 1) elif get_option('driver_lxc').enabled() error('Required kernel features for LXC were not found') endif diff --git a/src/util/virfile.c b/src/util/virfile.c index cef9f9979a..7b37d6888e 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -66,9 +66,7 @@ # include # endif # include -# if WITH_DECL_LO_FLAGS_AUTOCLEAR -# include -# endif +# include # include # include /* These come from linux/fs.h, but that header conflicts with @@ -748,7 +746,7 @@ int virFileUpdatePerm(const char *path, } =20 =20 -#if defined(__linux__) && WITH_DECL_LO_FLAGS_AUTOCLEAR +#if defined(__linux__) =20 /* virFileLoopDeviceOpenLoopCtl() returns -1 when a real failure has occur= red * while in the process of allocating or opening the loop device. On succ= ess --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510147; cv=none; d=zohomail.com; s=zohoarc; b=RZY9teE08A8qBElBc7u32MMlQKv4dwIkmzELNmA4/KWXx1vUrAXfIokNVrFbEUxBLlwHuEjGzEQDHeQbWybdYWopPjMkbg8cM3jXnaykcpGbSxfg1tKSC4Ctm7YJXF6sjit25bV8uAA6Io755jZQvEtHHcZIjKElV6WgNTk0IiM= 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=tPyoTYOUmwMdvv3IyAUXWaIRLerxyzfop542HmPRNCQ=; b=K3BIN/FK2IYvGYHOaCiNzlmQStT2flSgUSiz1l7JdNtAu8hAFekpwNAdOGEhqVNjDfZBhlYOYXUtvdew0gJe+A8yGhkPtFXq7EXfi/zy3LbUU0eL/Kwc+tsSlR1qGFLRzPkyoFYRFhN41QLtyQ258VyIKGy4wNOiVwe1Usih2YM= 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 1670510147728143.57358762840806; 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-260-4J8nel8EOKq6df2sD2Mm6Q-1; Thu, 08 Dec 2022 09:35:41 -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 187E4804184; 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 0522E40C6EC3; 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 DE1841946A44; Thu, 8 Dec 2022 14:35:35 +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 A19021946A44 for ; Thu, 8 Dec 2022 14:35:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8A2222024CC1; Thu, 8 Dec 2022 14:35:34 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id E247B200AD47; Thu, 8 Dec 2022 14:35:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510146; 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=tPyoTYOUmwMdvv3IyAUXWaIRLerxyzfop542HmPRNCQ=; b=af3aZnz4wV/ysB+D8ynAn+VlxjK/b7u+1gLZIvuwe+BskJsK1gsue9HmeaeN1wLnI1PFzo N0vD6LObRsK3XrHT/DNwpaZ8eRyuLVYuTDOtDdozYdvii1t1hT6f/WiaCPJPC8MxkHO/4f K4dc1Grt0cXjRstZgNKuXaFXbDNMVJI= X-MC-Unique: 4J8nel8EOKq6df2sD2Mm6Q-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 04/21] meson: drop check for unshare() Date: Thu, 8 Dec 2022 14:35:08 +0000 Message-Id: <20221208143525.1731853-5-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: 1670510148595100001 The unshare() syscall was introduced to Linux in commit 2da436e00f9a5fdd0fb6b31e4b2b2ba82e8f5ab8 Author: JANAK DESAI Date: Tue Feb 7 12:59:03 2006 -0800 [PATCH] unshare system call -v5: system call registration for i386 This is old enough that all our supported platforms can be assumed to have this feature. Furthermore, the virprocess.c file was already using unshare() with nothing more than a #ifdef __linux__ check. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/meson.build b/meson.build index 212c3cfafb..0a09e510c7 100644 --- a/meson.build +++ b/meson.build @@ -1526,20 +1526,7 @@ elif get_option('driver_libxl').enabled() endif =20 if not get_option('driver_lxc').disabled() and host_machine.system() =3D= =3D 'linux' and conf.has('WITH_LIBVIRTD') - lxc_support_code =3D ''' -#include -#include -#include - -void main(void) { - unshare(1); -} - ''' - if cc.compiles(lxc_support_code, name: 'lxc support', args: '-D_GNU_SOUR= CE') - conf.set('WITH_LXC', 1) - elif get_option('driver_lxc').enabled() - error('Required kernel features for LXC were not found') - endif + conf.set('WITH_LXC', 1) elif get_option('driver_lxc').enabled() error('linux and remote_driver are required for LXC') endif --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Fri May 17 08:25:14 2024 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=1670510166; cv=none; d=zohomail.com; s=zohoarc; b=h0A6CFERTCmzw7nFBhOTW1JaDy8xvzBxLDci32hFLfEsoZLABnhOlYlsqHSSwnZ4zDvby5XxHAUxS20Hov6z/nafIjEMiPW/r1VJPsNiYR3jDtRfn+K05h842APPvhdoaRcKM2L0O25EiFO5FuYXAiSb4nR7ywlQUfaS2L0JUtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510166; 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=CK6cuhd0Ll8PWElx30Zi7vbFPr/RxleBUlHClwjeryk=; b=jn8kXAJcMuAU5C9rHgS1Xwt3oWmGICI1yvKwwp4cCy8HexJpAeEZQhvHS9P5ZtMhSXG90vJgoAt4U6WBaHVpvkQivTeor/Eixffd4biA2+GPOJcJlnFOoKa5wdw7r//ZokGqgaJVYTAkMCgCdjebGe8nMg4fA9sMWuNUpUavPZg= 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 1670510166489610.7544860338884; Thu, 8 Dec 2022 06:36:06 -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-517-KNcGqLiuO4W8tr5ZdsvrtA-1; Thu, 08 Dec 2022 09:35:45 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BBAEE2A59559; Thu, 8 Dec 2022 14:35:37 +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 A7A7517582; Thu, 8 Dec 2022 14:35:37 +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 97AD61946A44; Thu, 8 Dec 2022 14:35:37 +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 7BB6C1946A72 for ; Thu, 8 Dec 2022 14:35:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5E2E72028E8F; Thu, 8 Dec 2022 14:35:36 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id B79122024CC0; Thu, 8 Dec 2022 14:35:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510165; 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=CK6cuhd0Ll8PWElx30Zi7vbFPr/RxleBUlHClwjeryk=; b=iKpMsy4rEzt3jxA4IFZIGOrcO6yZUl2xKj+tTDdHsto9eHGmJjbC9QA3T2ngvwO270qr0u lXODtKwIgTNggEHw6qdHVRMXY7DctSS+fprnBbtf09Hhubb4PCSRFa1RFlSbRj9Bn9Ri19 8NAxGcQVbh8PPGJ0OaiF+aXfzh9rSqE= X-MC-Unique: KNcGqLiuO4W8tr5ZdsvrtA-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 06/21] meson: remove obsolete check for ETHTOOL_GGSO Date: Thu, 8 Dec 2022 14:35:10 +0000 Message-Id: <20221208143525.1731853-7-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.5 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: 1670510168676100001 The ETHTOOL_GGSO constant was introduced to Linux in commit 37c3185a02d4b85fbe134bf5204535405dd2c957 Author: Herbert Xu Date: Thu Jun 22 03:07:29 2006 -0700 [NET]: Added GSO toggle This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - src/util/virnetdev.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/meson.build b/meson.build index 0a09e510c7..69d79963f7 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_GGSO' ], [ 'linux/ethtool.h', 'ETHTOOL_GGRO' ], [ 'linux/ethtool.h', 'ETHTOOL_GFLAGS' ], [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index c21cf69be1..3fdf71e41e 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3083,9 +3083,7 @@ virNetDevGetEthtoolFeatures(const char *ifname, {ETHTOOL_GTXCSUM, VIR_NET_DEV_FEAT_GTXCSUM}, {ETHTOOL_GSG, VIR_NET_DEV_FEAT_GSG}, {ETHTOOL_GTSO, VIR_NET_DEV_FEAT_GTSO}, -# if WITH_DECL_ETHTOOL_GGSO {ETHTOOL_GGSO, VIR_NET_DEV_FEAT_GGSO}, -# endif # if WITH_DECL_ETHTOOL_GGRO {ETHTOOL_GGRO, VIR_NET_DEV_FEAT_GGRO}, # endif --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510225; cv=none; d=zohomail.com; s=zohoarc; b=mj9r+qyIraQ2OOKeA5l/G1iRUP68AlH/6+AamQWV5G4JW/LvyUdjPmUjPLCLcX1iM07pqqc8SSSJiRFY9vZJmTJktsY3RoMI4wQROKtxVkhhgC5qU1uaSy+L7TEmC/SkBB+m8PFlj+SnYty3wjEfjYN+sEg3qPOU5kS3n5qmUNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510225; 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=Sy7i/QPZVUr9F0Jeixh5XtsC9Kcw+feZxl1xvWg1f74=; b=bGQf1r55UAhg+Kd7wGDrjZ3QHxzHj1RTSrlsaJ6gFSPSonkH92NNfRmGPIYIOC3n0GCQrprFLbqWvjzqI4y1UnNDrhkoVDEfdb1S/xqgOxjkwVjlIqg0OSFaUAUBHatPkd1ZzgKnCrpz+yf5U1C0aXInO70MFv35DkmZU/Reub4= 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 1670510225763781.4800581675439; Thu, 8 Dec 2022 06:37:05 -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-103-jTYn6WrkNJGnQl1pJPG1JQ-1; Thu, 08 Dec 2022 09:35:45 -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 ABC2F80600F; 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 9842A492B04; 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 825631946A44; Thu, 8 Dec 2022 14:35:39 +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 666371946A41 for ; Thu, 8 Dec 2022 14:35:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5AC2F201F403; Thu, 8 Dec 2022 14:35:37 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA2FD2023A16; Thu, 8 Dec 2022 14:35:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510224; 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=Sy7i/QPZVUr9F0Jeixh5XtsC9Kcw+feZxl1xvWg1f74=; b=dahdD7FJc9vbOnq4RU54FfN7l/QaUwuXSV3nalNyOcbuj7RTl/y9Yq8xCkdr1q4Z3sev8n 9fppRb8+tWPr93X6QelRQiN+pVGyrK1NdDyKvPL4hlLWomAMR69QJkdPKZUhSgQz818/1+ 6T6K77dTgGafdkeEghUht62sg7YFhzg= X-MC-Unique: jTYn6WrkNJGnQl1pJPG1JQ-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 07/21] meson: remove obsolete check for ETHTOOL_GGRO Date: Thu, 8 Dec 2022 14:35:11 +0000 Message-Id: <20221208143525.1731853-8-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: 1670510226701100001 The ETHTOOL_GGRO constant was introduced to Linux in commit b240a0e5644eb817c4a397098a40e1ad42a615bc Author: Herbert Xu Date: Mon Dec 15 23:44:31 2008 -0800 ethtool: Add GGRO and SGRO ops This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - src/util/virnetdev.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/meson.build b/meson.build index 69d79963f7..be5d356b88 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_GGRO' ], [ 'linux/ethtool.h', 'ETHTOOL_GFLAGS' ], [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ], [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 3fdf71e41e..bf7393b476 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3084,9 +3084,7 @@ virNetDevGetEthtoolFeatures(const char *ifname, {ETHTOOL_GSG, VIR_NET_DEV_FEAT_GSG}, {ETHTOOL_GTSO, VIR_NET_DEV_FEAT_GTSO}, {ETHTOOL_GGSO, VIR_NET_DEV_FEAT_GGSO}, -# if WITH_DECL_ETHTOOL_GGRO {ETHTOOL_GGRO, VIR_NET_DEV_FEAT_GGRO}, -# endif }; =20 # if WITH_DECL_ETHTOOL_GFLAGS --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Fri May 17 08:25:14 2024 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=1670510148; cv=none; d=zohomail.com; s=zohoarc; b=M/2wh5yH+fQrMmuDUED0KSMwp/MQaTLaGAotbPRYLa7SiRPLAuJWUggwS8yEuPLvDPyB8xkRMQiE4V6Lf5Z2CKYNFoIK/WjtT9fzEIa8u/SYCHUgHglyLabFW/9/0Ph5WnxCQLHN+NLdjjZ+JmYkI08meLhzeal97abHLYruf8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510148; 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=aclLWlcsDpOMfhkR3UyW3/q83ju5ycmls4YFSAKNMCM=; b=N+uiffv3vOR1aBD6TPQs0w/O9gs9O+dguuugz/ebnSOGSrfoO8YvBrkiwZsmoivUj2H9wiNG7jJtnc78LF/4pn8VWpqLq0qTtAiTf7eWQkCHNDir1WEtkrIVcjIKMdnH8b3dYeyxUfSMrq7+gScePKoOSsvNzJ5/eA2LxafWjVU= 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 1670510148531304.5325229602488; Thu, 8 Dec 2022 06:35:48 -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-578-ge1H41sLOOGRal4zFlzKfA-1; Thu, 08 Dec 2022 09:35:45 -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 74D0B823F08; Thu, 8 Dec 2022 14:35:40 +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 622D5492B04; Thu, 8 Dec 2022 14:35:40 +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 482CC1946A41; Thu, 8 Dec 2022 14:35:40 +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 3291B1946A4B for ; Thu, 8 Dec 2022 14:35:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 250B02024CC1; Thu, 8 Dec 2022 14:35:39 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EC662023A16; Thu, 8 Dec 2022 14:35:38 +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=aclLWlcsDpOMfhkR3UyW3/q83ju5ycmls4YFSAKNMCM=; b=WIAqYj6lACTbRnS6DnQPDnWLxWTyAHxVfSVuVTfvs1dhfFJOpQZk55gY+65my74wReLeA1 GcuW67KdRijHGqkN+Ye4fOVBxEsvz/aG0NM3seZIWjY91ZgvjJeyq8F3syMP7RVQA1nU0S O4vXsiLeyBRsPu/VRYLFfuXiMFvcYPk= X-MC-Unique: ge1H41sLOOGRal4zFlzKfA-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 09/21] meson: remove obsolete check for ETH_FLAG_LRO Date: Thu, 8 Dec 2022 14:35:13 +0000 Message-Id: <20221208143525.1731853-10-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: 1670510150604100005 The ETH_FLAG_LRO 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 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - src/util/virnetdev.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/meson.build b/meson.build index 4703b2c670..3194c2f9af 100644 --- a/meson.build +++ b/meson.build @@ -653,7 +653,6 @@ symbols =3D [ [ 'linux/ethtool.h', 'ETH_FLAG_TXVLAN' ], [ 'linux/ethtool.h', 'ETH_FLAG_NTUPLE' ], [ 'linux/ethtool.h', 'ETH_FLAG_RXHASH' ], - [ 'linux/ethtool.h', 'ETH_FLAG_LRO' ], [ '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 f6e2b06102..b7de487c36 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3089,9 +3089,7 @@ virNetDevGetEthtoolFeatures(const char *ifname, =20 /* ethtool masks */ struct virNetDevEthtoolFeatureCmd flags[] =3D { -# if WITH_DECL_ETH_FLAG_LRO {ETH_FLAG_LRO, VIR_NET_DEV_FEAT_LRO}, -# endif # if WITH_DECL_ETH_FLAG_TXVLAN {ETH_FLAG_RXVLAN, VIR_NET_DEV_FEAT_RXVLAN}, {ETH_FLAG_TXVLAN, VIR_NET_DEV_FEAT_TXVLAN}, --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510149; cv=none; d=zohomail.com; s=zohoarc; b=L5LetS2OByX446s+5d/m41/znpgJU0Hly9dfLg1ERsErDK8k8oPJwox1MCq53ZEJlifAFGDOXQjIu5up31WQi0YtxK73diU/UX9f4UA3CKlzkzc9DG+GT6TaWSnMoDEXqwO5rvfF8jMTybeiQB9qL1sq8FLYQDY3SR/coVYm/AE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510149; 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=l8zrC6TBrq8FG3D06ca4TPgCarzEqd++1r1QmEyq8Fk=; b=n3yG+HJX2Rxiyn413kXtFMuTMyTaxAjF1Mkt7l/QNSxP1KBumy+7JOyZ7LN7XtPpoMxmlkWvMfUwqD7D8L+obp4MuPJHhNFoZL4tj8mQLdLXP43chOY8V2bBKHDT2aAzIbPwTEpvziiIixiQo6/e5DV2jLQrHV72+dkjOWSOGl4= 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 1670510149593896.9358660822369; Thu, 8 Dec 2022 06:35:49 -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-98-Zq0IhYIqP16ilUQ7H2xsLw-1; Thu, 08 Dec 2022 09:35:45 -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 23BA13C10686; Thu, 8 Dec 2022 14:35:41 +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 0EEB940C6EC3; Thu, 8 Dec 2022 14:35:41 +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 F1F0C1946A44; Thu, 8 Dec 2022 14:35:40 +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 20E041946A41 for ; Thu, 8 Dec 2022 14:35:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 053B2202323C; Thu, 8 Dec 2022 14:35:40 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A5522027064; Thu, 8 Dec 2022 14:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510148; 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=l8zrC6TBrq8FG3D06ca4TPgCarzEqd++1r1QmEyq8Fk=; b=ZeA4brYC3gr1KI4VJU+bTnr2vD6fb/tSdqAAlUtlFfi8CWOYgF3BQbnjrBc1TSN+XlywsW H0KNEu7mELTAbMeuahQHFmqS0kSAk77xrty2uuZ8PAQHamdBiDwjEXS3A3Ow04KxNwc8uE nnWVA5KKwzjJ4xbNPVXa8n/CWlqfXkw= X-MC-Unique: Zq0IhYIqP16ilUQ7H2xsLw-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 10/21] meson: remove obsolete check for ETH_FLAG_TXVLAN/RXVLAN Date: Thu, 8 Dec 2022 14:35:14 +0000 Message-Id: <20221208143525.1731853-11-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: 1670510150606100006 The ETH_FLAG_TXVLAN/RXVLAN constants were introduced to Linux in commit d5dbda23804156ae6f35025ade5307a49d1db6d7 Author: Jesse Gross Date: Wed Oct 20 13:56:07 2010 +0000 ethtool: Add support for vlan accleration. This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index 3194c2f9af..93c8d12264 100644 --- a/meson.build +++ b/meson.build @@ -650,7 +650,6 @@ symbols =3D [ # Check whether endian provides handy macros. [ 'endian.h', 'htole64' ], =20 - [ 'linux/ethtool.h', 'ETH_FLAG_TXVLAN' ], [ 'linux/ethtool.h', 'ETH_FLAG_NTUPLE' ], [ 'linux/ethtool.h', 'ETH_FLAG_RXHASH' ], [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ], --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510186; cv=none; d=zohomail.com; s=zohoarc; b=PYWPL6B8jLkexGuhZjNsDjLZnO85MfTgZJ3XVUNnZBfRUIIxe2OdD0RNIG1XDxMuBAt0PYBjEGqtmJLoySUo3A33A0cqnsqluIa4JxypHlWb5OFv8fXbllG3bcsH17Oth0wn5QV/RbXh7I0XGzdqMig5bioYnC0kSd5yZzyh6hQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510186; 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=7lTku8LtsYdV13AkZtDV1VyxK/50I3i1IlAreS2Xb9U=; b=etHoLmzwT6EWsEm8Lz5jC1NFaoJnY0uyWwlJzGGTbrLuCfsOvb6pD1LcWbMkWNBfmf6QkrWlrQhUka7YSU4FomEQ1ErjMrH6jUIaLaOivCjYUYW7ZNbiykY4mNvwCJqnj4PQbmVMot8BwTAFu8g/NrpOATSi21FqocWyqNQKq3c= 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 1670510186464559.8062345858096; Thu, 8 Dec 2022 06:36:26 -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-331-QJ779Kp-ObeTSLBxYNCtqQ-1; Thu, 08 Dec 2022 09:36:19 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5BA1782DFBC; Thu, 8 Dec 2022 14:35:54 +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 3070A4EA4D; Thu, 8 Dec 2022 14:35:54 +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 54D0B1947050; Thu, 8 Dec 2022 14:35:52 +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 DA063194704A for ; Thu, 8 Dec 2022 14:35:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 18E7C2022EA4; Thu, 8 Dec 2022 14:35:41 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47519202279C; Thu, 8 Dec 2022 14:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510185; 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=7lTku8LtsYdV13AkZtDV1VyxK/50I3i1IlAreS2Xb9U=; b=DoigaTyftaD9kwOAc9WSm9mhkUg0gINi++hdZtUE0IY03Y8xcJ5mr13ZV1pcsnBsAj6RgT 7VQFUskIC81tJ6bQ/PnQdjeO2TeJR+K4CSkdph2tgy5q4Dqwx07GJcmf8QiQR+8NdSLfok hEuVW603c3BFUyWdNCd5VCDSxARS7HI= X-MC-Unique: QJ779Kp-ObeTSLBxYNCtqQ-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 11/21] meson: remove obsolete check for ETH_FLAG_NTUPLE Date: Thu, 8 Dec 2022 14:35:15 +0000 Message-Id: <20221208143525.1731853-12-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.5 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: 1670510186760100001 The ETH_FLAG_NTUPLE constant was introduced to Linux in commit 15682bc488d4af8c9bb998844a94281025e0a333 Author: Peter P Waskiewicz Jr Date: Wed Feb 10 20:03:05 2010 -0800 ethtool: Introduce n-tuple filter programming support This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - src/util/virnetdev.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/meson.build b/meson.build index 93c8d12264..d9af1ac36a 100644 --- a/meson.build +++ b/meson.build @@ -650,7 +650,6 @@ symbols =3D [ # Check whether endian provides handy macros. [ 'endian.h', 'htole64' ], =20 - [ 'linux/ethtool.h', 'ETH_FLAG_NTUPLE' ], [ 'linux/ethtool.h', 'ETH_FLAG_RXHASH' ], [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ], [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b7de487c36..5ef4687191 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3090,13 +3090,9 @@ virNetDevGetEthtoolFeatures(const char *ifname, /* ethtool masks */ struct virNetDevEthtoolFeatureCmd flags[] =3D { {ETH_FLAG_LRO, VIR_NET_DEV_FEAT_LRO}, -# 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 {ETH_FLAG_NTUPLE, VIR_NET_DEV_FEAT_NTUPLE}, -# endif # if WITH_DECL_ETH_FLAG_RXHASH {ETH_FLAG_RXHASH, VIR_NET_DEV_FEAT_RXHASH}, # endif --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=DYCofeKTvU61UP1U8ZcitrByI9oyxQU1qyHETK9T/Koc+IUy1jAxYEn4hSYll/vS9NxrWkH23UX31A5OuQXipA5Le2ANmiTuZTXr0eQLmfkkoVY8Y2T0GyznDFYmIHrA6p64Le01LJp7voBTgWWHJQ5S5GkX+LnpMc41twCVNso= 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=Xzg43BG2hkIiIJ9DpcDMywFvEcmhfcbIMsX9cn09QXU=; b=Q71Q6cmhQAxoupusBIcRrTWDhB/rhffCOQgDHPQD9lZSqGfwA53nkv2Ad5K4/nKllzj0vJPcGTBoQNyB5ob+MW9a/Lg1CEU5wnRq6/o4p2f3J5YdyDO0c4r5kf6Pl5LiZpdvCGfit26M4OE7By5QFeEGijwf8lOgjv9A+I6Skg0= 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 1670510195745861.6303356109944; 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-218-Iy5p9dt3MiS1Wj_5UyRDvg-1; Thu, 08 Dec 2022 09:36:27 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 057CA1006E32; 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 E1C981121339; 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 CBEC9194707A; 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 E4E6E1947051 for ; Thu, 8 Dec 2022 14:35:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EDA9E2024CC5; Thu, 8 Dec 2022 14:35:41 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62C932024CC0; Thu, 8 Dec 2022 14:35:41 +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=Xzg43BG2hkIiIJ9DpcDMywFvEcmhfcbIMsX9cn09QXU=; b=BbmB2/+Nzuw/kk1DTcwNZiqucVrWHH67bhu7AKsnv1pEhXS5JcO4cHDLBQYok/B6rSGcto J38Tb4MYNyxNxsGYnq2k0Wf3iQlXuEz9E8aCG7Y8a+yCsFeEtSfct7us7puLCklZNQkABh kCG0enHYyyywFfGnqSK7dO63QNriA/c= X-MC-Unique: Iy5p9dt3MiS1Wj_5UyRDvg-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 12/21] meson: remove obsolete check for ETH_FLAG_RXHASH Date: Thu, 8 Dec 2022 14:35:16 +0000 Message-Id: <20221208143525.1731853-13-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.3 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: 1670510206460100001 The ETH_FLAG_RXHASH constant was introduced to Linux in commit b00fabb4020d17bda4bea59507e09fadf573088d Author: stephen hemminger Date: Mon Mar 29 14:47:27 2010 +0000 netdev: ethtool RXHASH flag This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - src/util/virnetdev.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/meson.build b/meson.build index d9af1ac36a..ff6908d3c4 100644 --- a/meson.build +++ b/meson.build @@ -650,7 +650,6 @@ symbols =3D [ # Check whether endian provides handy macros. [ 'endian.h', 'htole64' ], =20 - [ 'linux/ethtool.h', 'ETH_FLAG_RXHASH' ], [ '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 5ef4687191..52b8d53ed8 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3093,9 +3093,7 @@ virNetDevGetEthtoolFeatures(const char *ifname, {ETH_FLAG_RXVLAN, VIR_NET_DEV_FEAT_RXVLAN}, {ETH_FLAG_TXVLAN, VIR_NET_DEV_FEAT_TXVLAN}, {ETH_FLAG_NTUPLE, VIR_NET_DEV_FEAT_NTUPLE}, -# if WITH_DECL_ETH_FLAG_RXHASH {ETH_FLAG_RXHASH, VIR_NET_DEV_FEAT_RXHASH}, -# endif }; =20 for (i =3D 0; i < G_N_ELEMENTS(ethtool_cmds); i++) { --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510196; cv=none; d=zohomail.com; s=zohoarc; b=JzWxk8CbX0LYsNaSn37enJy39LFC3bZWVPok4cGG0/7txvi2H315BmeZ04A0r/+eMVFcMTUbHgS8MsVxIoYEZAE9nUUrqxkYrG0UCJ4RRZ6GVpe2ekFlfsc671hOcGIG8cLUK8NWIiVYm6m4nnB2Th3WpzqSBggs7uyL8ym56WA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510196; 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=ZYdSU+vHHyBV1esSUGG6nzitNbXo0P45wJw4hTpMg9I=; b=G38Jvp2vGHkfMZtyzilbMxwtQ2aYMoGi8dV/Xxr0AK6VNu6beSyfetEYl34n13acu9CFCE6WnHVgfPT9Ie0B1W797Z1wbn13rqjYy1Y2S/WisXtzm6szcGlI5djjA5iC/Asn1YscETGPpaG49bo5XZ/lr82RGCpLz1qCs9mP3Lc= 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 1670510195994934.1167299084101; 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-649-6-VE0qcOOAufIBjueThCdw-1; Thu, 08 Dec 2022 09:36:30 -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 A81E11C09072; 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 8E56B492B05; Thu, 8 Dec 2022 14:35:58 +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 B9CF9194706C; Thu, 8 Dec 2022 14:35:57 +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 1B8D41947075 for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C4B3F2024CC6; Thu, 8 Dec 2022 14:35:42 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 390F62024CC0; Thu, 8 Dec 2022 14:35:42 +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=ZYdSU+vHHyBV1esSUGG6nzitNbXo0P45wJw4hTpMg9I=; b=Di9RAovQqoW5rjZC5PAmmfH9oW5/GrvsTnTU1N4RjFJJLDxk928aCHAq8Rt/1qy+fSNANZ 9nGlqvAgNhFLuzoXCaG9hlqJeHhPO71LXDW8Dc3iYpf91QnQanXSp1612Nh/kjoCtJ9W/K KfExI+nLu4MOgdh/Pouv3YSf2AXaA8c= X-MC-Unique: 6-VE0qcOOAufIBjueThCdw-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 13/21] meson: remove obsolete check for ETHTOOL_GFEATURES Date: Thu, 8 Dec 2022 14:35:17 +0000 Message-Id: <20221208143525.1731853-14-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: 1670510208884100005 The ETHTOOL_GFEATURES constant was introduced to Linux in commit 5455c6998d34dc983a8693500e4dffefc3682dc5 Author: Micha=C5=82 Miros=C5=82aw Date: Tue Feb 15 16:59:17 2011 +0000 net: Introduce new feature setting ops This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - src/util/virnetdev.c | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/meson.build b/meson.build index ff6908d3c4..a3a512a565 100644 --- a/meson.build +++ b/meson.build @@ -650,7 +650,6 @@ symbols =3D [ # Check whether endian provides handy macros. [ 'endian.h', 'htole64' ], =20 - [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ], [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ], [ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ], =20 diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 52b8d53ed8..c2bccf4e49 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -86,7 +86,7 @@ VIR_LOG_INIT("util.netdev"); #endif =20 #define RESOURCE_FILE_LEN 4096 -#if WITH_DECL_ETHTOOL_GFEATURES +#ifdef __linux__ # define TX_UDP_TNL 25 # define GFEATURES_SIZE 2 # define FEATURE_WORD(blocks, index, field) ((blocks)[(index) / 32U].fiel= d) @@ -3264,7 +3264,6 @@ virNetDevSwitchdevFeature(const char *ifname G_GNUC_U= NUSED, # endif =20 =20 -# if WITH_DECL_ETHTOOL_GFEATURES /** * virNetDevGFeatureAvailable * This function checks for the availability of a network device gfeature @@ -3305,16 +3304,6 @@ virNetDevGetEthtoolGFeatures(const char *ifname, ignore_value(virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL)); return 0; } -# else -static int -virNetDevGetEthtoolGFeatures(const char *ifname G_GNUC_UNUSED, - virBitmap *bitmap G_GNUC_UNUSED, - int fd G_GNUC_UNUSED, - struct ifreq *ifr G_GNUC_UNUSED) -{ - return 0; -} -# endif =20 =20 # if WITH_DECL_ETHTOOL_SCOALESCE && WITH_DECL_ETHTOOL_GCOALESCE --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510227; cv=none; d=zohomail.com; s=zohoarc; b=huEPZeCnpIQhq4N6UEGhdUyMPW9yulkETg40PjmVae/rAJc97eiK0TC0DFrRHhegWeORXAI1qZ1lqJd4Bu50ohaCh7XUrAjNgKIxr189Z3qBzuuuH/VA6gmKCEDnVasdZ6gJNhtGnzCQm82lVQsFtYxzrCC9rMcHVCGWVTcGffo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510227; 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=jvMjDw+vV+cu7MzEHYUgKgz410RO7g9eBjmxUy5YAf4=; b=jXB3O4IRr2ZEC7tGU4sjF3doxBv67/9BZLnnsiLZEAQMdJn3oC6YpuFiokgeO7005ExbdkUVP/Rab7miLelWgq5w1i8ukKo0gSNv3P8d15HouF6mbpjx5rt2dcs6F4uJtclNtWTbQn1a68xOSFmvFYJqSq3Uc1tWSSIkvbMEVi4= 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 167051022639326.89144083753922; 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-607-Fur-1LUaOS-g_ETSadfJTQ-1; Thu, 08 Dec 2022 09:36:27 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 427D4857D1C; 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 2E22E1401C39; 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 6886F1947BBE; 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 2775219459FC for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9CA9D2024CC8; Thu, 8 Dec 2022 14:35:43 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 121012024CC0; Thu, 8 Dec 2022 14:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510223; 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=jvMjDw+vV+cu7MzEHYUgKgz410RO7g9eBjmxUy5YAf4=; b=SeKEz7ljK/ti6UUD7C5TibLX/I68vqbXRZJz4PkNSCukZbIxuCHl8jF+6oeP86Ad9aGFLo gfyQc6zzA1sST2FV08kSQc8aal5tCt7U2EzDhYBrxa/5/Lupj38LPjJMZd0qnABA6AEGax uOSMW/d9YG2secDdh6LcPv3UcryEbew= X-MC-Unique: Fur-1LUaOS-g_ETSadfJTQ-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 14/21] meson: remove obsolete check for ETHTOOL_GCOALESCE Date: Thu, 8 Dec 2022 14:35:18 +0000 Message-Id: <20221208143525.1731853-15-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.7 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: 1670510228639100003 The ETHTOOL_GCOALESCE 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 Reviewed-by: J=C3=A1n Tomko --- meson.build | 3 --- src/util/virnetdev.c | 15 --------------- 2 files changed, 18 deletions(-) diff --git a/meson.build b/meson.build index a3a512a565..7fb17bf983 100644 --- a/meson.build +++ b/meson.build @@ -650,9 +650,6 @@ symbols =3D [ # Check whether endian provides handy macros. [ 'endian.h', 'htole64' ], =20 - [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ], - [ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ], - # GET_VLAN_VID_CMD is required for virNetDevGetVLanID [ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ], =20 diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index c2bccf4e49..a73d624453 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3306,7 +3306,6 @@ virNetDevGetEthtoolGFeatures(const char *ifname, } =20 =20 -# if WITH_DECL_ETHTOOL_SCOALESCE && WITH_DECL_ETHTOOL_GCOALESCE /** * virNetDevSetCoalesce: * @ifname: interface name to modify @@ -3402,20 +3401,6 @@ int virNetDevSetCoalesce(const char *ifname, =20 return 0; } -# else -int virNetDevSetCoalesce(const char *ifname, - virNetDevCoalesce *coalesce, - bool update) -{ - if (!coalesce && !update) - return 0; - - virReportSystemError(ENOSYS, - _("Cannot set coalesce info on interface '%s'"), - ifname); - return -1; -} -# endif =20 =20 /** --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Fri May 17 08:25:14 2024 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=1670510234; cv=none; d=zohomail.com; s=zohoarc; b=IxnNAkt+KjbEOKQF769gFwJVt5Kmu+uOF7M4sm9qrZVqs1N3q93JSD2f/qZab0iv1V4pUken3ugpofvyH4ENidR92kikUuHlFzVr1G4yBmXm4GHIIgxk+4OQe/P4SprHQ00UEdzCeXtKqjEWi6cVDWcoe1sC9GyN24h6F9lTZfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510234; 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=Uom/8wB1skRLtDDOHePrzSM4qw3qMAMTyyIf8G7wklI=; b=VIDHtwMROdqaeCkP3b5FUHJryEB7PEkq55ByFKmcoQlFJIPZXL5JigvxYQ2mccIcqQrzrdWXxHJe1rGtQhyQ+WiODoyz1fv3DkBr4VbF4JM7+/1q7lduR90mf6CMCw9ATnYFRZ3gaQn5zpgMcnDYwlHDefo7GQ7J+7E8GjB5ArQ= 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 1670510234557635.9316985071299; Thu, 8 Dec 2022 06:37:14 -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-167-4rDhFl-mPmKQ1PAd4O40Mg-1; Thu, 08 Dec 2022 09:36:31 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D18B21C09B7A; Thu, 8 Dec 2022 14:35:59 +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 B6CCB40C2064; Thu, 8 Dec 2022 14:35:59 +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 5DABC1947051; Thu, 8 Dec 2022 14:35:59 +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 464E219459FC for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4AF9E20290A6; Thu, 8 Dec 2022 14:35:45 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id B449620290A2; Thu, 8 Dec 2022 14:35:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510233; 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=Uom/8wB1skRLtDDOHePrzSM4qw3qMAMTyyIf8G7wklI=; b=E9gidJiKbK+6y6ZhqLtDUSPRs2wa3md2uB1eEYd5kGMd7owBzS9WBHHuf7yOCYdzVe8KHo q67530BvrtN1DWPhT4F1oFEDj2a9MtenJwrVvUWV72P6A2a0CSoF33laSpsdC0KbTrSIWX txpmp63VdS73hBnwNoQgyHqnHhJ3aJE= X-MC-Unique: 4rDhFl-mPmKQ1PAd4O40Mg-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 16/21] meson: simplify check for virnetdevbridge.c headers Date: Thu, 8 Dec 2022 14:35:20 +0000 Message-Id: <20221208143525.1731853-17-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.1 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: 1670510236665100001 The headers required by virnetdevbridge.c have all exited since before Linux moved to git. It is sufficient to check for just one of them in order to give an error message about needing kernel headers installed. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index f28af30936..79f9d47520 100644 --- a/meson.build +++ b/meson.build @@ -628,19 +628,11 @@ foreach name : headers endif endforeach =20 -# check for kernel headers required by src/util/virnetdevbridge.c +# check for kernel header required by src/util/virnetdevbridge.c if host_machine.system() =3D=3D 'linux' - required_headers =3D [ - 'linux/param.h', - 'linux/sockios.h', - 'linux/if_bridge.h', - 'linux/if_tun.h', - ] - foreach name : required_headers - if not cc.has_header(name) - error('You must install kernel-headers in order to compile libvirt w= ith QEMU or LXC support') - endif - endforeach + if not cc.has_header('linux/sockios.h') + error('You must install kernel-headers in order to compile libvirt wit= h QEMU or LXC support') + endif endif =20 =20 --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Fri May 17 08:25:14 2024 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=1670510199; cv=none; d=zohomail.com; s=zohoarc; b=TKFrolqq6798ZxQ3FSk+derup4h/GvaRL317waYj6oPGAMErHndUN3mudF763DfBjojjMtRPa3pmbuXvpOCRWFAnFGEHV/iw5zdQ8rCFrAMEoH+UPUBavi7jZHmj4rqcOJCP4v8wGKB9XbAqQEOpRyobO889r51BtHlA8WsVhTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510199; 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=IpPyX9xpkMLs4rUYj3DC7/6dE8SMRpGDKFJxfyljfqw=; b=mbfAmNhpGit3y6siw4fSBDfRcnMc6Eq2LsDZHvHIH0TvdmUdzcqjOsGl5MqWkKPPW4f0V4PN1BM4aan1YMcy3+NXCZabqDC5cLiRujB6E7E5i//E7nCFwYELdardWgXAztPFjdyr4/Re1yrkUebLmoyiUB39v72qlq3uGPOygdo= 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 167051019971120.91060199802996; Thu, 8 Dec 2022 06:36:39 -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-457-pqzN7V25PeOxi3mLY2mgDQ-1; Thu, 08 Dec 2022 09:36:35 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E3AA857D1E; Thu, 8 Dec 2022 14:36:01 +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 44B781401C39; Thu, 8 Dec 2022 14:36:01 +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 B83791947052; Thu, 8 Dec 2022 14:36:00 +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 7F2A61947B92 for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EDB0220290AD; 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 649382028E8F; Thu, 8 Dec 2022 14:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510198; 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=IpPyX9xpkMLs4rUYj3DC7/6dE8SMRpGDKFJxfyljfqw=; b=YDcvZ51lXADkoG6+bgDkLOXvRloMAtoSX2vJgtin82a+RsIHbS3DRCgh6FDNLr/ubrbVsV LOiHAXieEy7TKTrCIQ2TkatJmwWEXPsf1j4IeGQ0LHIBNqWH/LBq5kyXOyfw+nPjM4lDNo Z+KnHvoLcaMJsRrWTlKIo/F7+xduv8w= X-MC-Unique: pqzN7V25PeOxi3mLY2mgDQ-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 18/21] meson: remove obsolete check for linux/magic.h Date: Thu, 8 Dec 2022 14:35:22 +0000 Message-Id: <20221208143525.1731853-19-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.7 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: 1670510209311100007 The linux/magic.h header has existed since commit e18fa700c9a31360bc8f193aa543b7ef7b39a06b Author: Jeff Garzik Date: Sun Sep 24 11:13:19 2006 -0400 Move several *_SUPER_MAGIC symbols to include/linux/magic.h. This is old enough that all our supported platforms can be assumed to have this header. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - src/util/virfile.c | 4 +--- tests/securityselinuxhelper.c | 4 +--- tests/virfilemock.c | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 30dd797ee5..612257a351 100644 --- a/meson.build +++ b/meson.build @@ -596,7 +596,6 @@ headers =3D [ 'ifaddrs.h', 'libtasn1.h', 'linux/kvm.h', - 'linux/magic.h', 'mntent.h', 'net/ethernet.h', 'net/if.h', diff --git a/src/util/virfile.c b/src/util/virfile.c index 7b37d6888e..feb0d7f8ba 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -62,9 +62,7 @@ #include =20 #ifdef __linux__ -# if WITH_LINUX_MAGIC_H -# include -# endif +# include # include # include # include diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 24c9f3841c..c32c90c17e 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -23,9 +23,7 @@ * detected. */ =20 #include "virmock.h" -#if WITH_LINUX_MAGIC_H -# include -#endif +#include #include #include #include diff --git a/tests/virfilemock.c b/tests/virfilemock.c index 093a8d7cf0..4f1b8aecd7 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -21,7 +21,7 @@ #include #include #include -#if WITH_LINUX_MAGIC_H +#ifdef __linux__ # include #endif =20 --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510200; cv=none; d=zohomail.com; s=zohoarc; b=nGpuVYtdwgen1wGFu2a9/uUGj5H1yLVgVvu1+l9icAm9dSRZmntGmDYHUSzyezVYi4BEMODxJ/ShmBhzSX/pUkGYXVl3IVgi5ZK8igWXO0NfISvus+B+sVV39Hly5yJuut5TR77kT61lL7bQWm1saP/q6y6mLDG3f9IPtoW6kLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510200; 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=Nm6rNcvZRP+bnk+EH8yaL94wQk6HBSzwAjkbhu/yBlo=; b=JEvzA1gJ4yWo8MrkIYPcUaTcKRD1yI262QNgZd361W5MQvZGpqhXWu2w1r4YmO91ETBW6W1XF3byJG589TlfPZ22nBe7Sd07Ysoj9nbm9kQMG2Opq2EivvfjSHBNWm4agLV3QZyrl2GoT+eQxuAFH4bv1SQrhzhywI6wa8A9Y0k= 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 1670510200464876.8311221483148; Thu, 8 Dec 2022 06:36:40 -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-147-bZBzxKJwM9GO4KKPQYVuLw-1; Thu, 08 Dec 2022 09:36:35 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B3E5E82DFE2; 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 A0F4117582; Thu, 8 Dec 2022 14:35:58 +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 C1E581947067; Thu, 8 Dec 2022 14:35:57 +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 B536C1947B92 for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C308C20290AF; Thu, 8 Dec 2022 14:35:47 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B7E420290AE; Thu, 8 Dec 2022 14:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510199; 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=Nm6rNcvZRP+bnk+EH8yaL94wQk6HBSzwAjkbhu/yBlo=; b=YcLFtGE0SQMLu3Qo180vplVp5Q1yb1kAS0b9sc82tXGSiZTi6SaBnipoO3VjSQB5SglhaD qpO+ntEsIqtiNFIwspJEycfZeUFOHUFCPD2P917xyb1bmOv8Iqut2Qukgbnhc3IxwTuvjb RAigl+aQ4cAIA+Ck4vMj8OuaQst800o= X-MC-Unique: bZBzxKJwM9GO4KKPQYVuLw-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 19/21] meson: remove obsolete check for VHOST_VSOCK_SET_GUEST_CID Date: Thu, 8 Dec 2022 14:35:23 +0000 Message-Id: <20221208143525.1731853-20-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.5 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: 1670510209473100009 The VHOST_VSOCK_SET_GUEST_CID constant was introduced to Linux in commit 433fc58e6bf2c8bd97e57153ed28e64fd78207b8 Author: Asias He Date: Thu Jul 28 15:36:34 2016 +0100 VSOCK: Introduce vhost_vsock.ko This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 3 --- src/util/virvsock.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 612257a351..95bc89ec52 100644 --- a/meson.build +++ b/meson.build @@ -646,9 +646,6 @@ symbols =3D [ =20 if host_machine.system() =3D=3D 'linux' symbols +=3D [ - # check for VHOST_VSOCK_SET_GUEST_CID - [ 'linux/vhost.h', 'VHOST_VSOCK_SET_GUEST_CID' ], - # Check if we have new enough kernel to support BPF devices for cgroup= s v2 [ 'linux/bpf.h', 'BPF_PROG_QUERY' ], [ 'linux/bpf.h', 'BPF_CGROUP_DEVICE' ], diff --git a/src/util/virvsock.c b/src/util/virvsock.c index 4bbbf78167..c6f8b362b8 100644 --- a/src/util/virvsock.c +++ b/src/util/virvsock.c @@ -21,7 +21,7 @@ # include #endif =20 -#if WITH_DECL_VHOST_VSOCK_SET_GUEST_CID +#ifdef __linux__ # include #endif =20 @@ -35,7 +35,7 @@ =20 VIR_LOG_INIT("util.vsock"); =20 -#if WITH_DECL_VHOST_VSOCK_SET_GUEST_CID +#ifdef __linux__ static int virVsockSetGuestCidQuiet(int fd, unsigned int guest_cid) --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510241; cv=none; d=zohomail.com; s=zohoarc; b=h5mFNV5TZoxaDbjRQpQ8u2S+7CF3+pNsY7gfllZbob5YElNk1WIdaGDM3+b7ZjeT55QBduubdnIuWV5LjCfckFUZ4b99fvsIkvxM9d8DjCcb3vhDHRzAeTHptWWGelzrUbEYv+DqSAqPjuq+8GwTNDgseyE8d8F9S9natOGd0mA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510241; 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=cx5N1Vn8UsG3bvXZTTLUlhHmMANhz/52f8agGoKPsfE=; b=Tj1k2sDGcFW44WXSEtiHFaxLs2OQ9ao5ALs6woLESsxgFhfudRXCSdCcY4ura3Z9w0BAjwbldHa5rjvRSKDMUz8Uehq2lUo07xFmrTjX/FJ4LwzvoYLujuRRh/e9Owg8kYZ5g8SZOvSsgCJUM9acZrqq6RtOXZBtAhClJ1Gaa+Y= 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 1670510241396623.8415937004172; Thu, 8 Dec 2022 06:37:21 -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-175-kkcEcrEcPSeLBdJt8BUkGA-1; Thu, 08 Dec 2022 09:36:35 -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 483C58065FC; Thu, 8 Dec 2022 14:36:00 +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 31E93492B04; Thu, 8 Dec 2022 14:36:00 +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 EE7821946A7C; Thu, 8 Dec 2022 14:35:59 +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 B485F194704B for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 99A772023A16; Thu, 8 Dec 2022 14:35:48 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1062D2028E8F; Thu, 8 Dec 2022 14:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510239; 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=cx5N1Vn8UsG3bvXZTTLUlhHmMANhz/52f8agGoKPsfE=; b=LafgRMVSkVp5YEr/SrJ5bpuJnB9oVZyLzts3CfL1EGbMvq8neApA0OGebmC9GCVOkHpwnc hXKlb9uUgz97JTsX5+73BbBPf7JVWRUYz/qyfV2M2FL5RLGsmUN8eR0c21bO8bZ2gKAKiQ 35WIu7+Tg9vckqKRZf9AQGlX1tukrIc= X-MC-Unique: kkcEcrEcPSeLBdJt8BUkGA-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 20/21] meson: remove obsolete check for BPF_PROG_QUERY Date: Thu, 8 Dec 2022 14:35:24 +0000 Message-Id: <20221208143525.1731853-21-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: 1670510242775100001 The BPF_PROG_QUERY constant was introduced to Linux in commit defd9c476fa6b01b4eb5450452bfd202138decb7 Author: Alexei Starovoitov Date: Mon Oct 2 22:50:26 2017 -0700 libbpf: sync bpf.h This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 1 - src/util/virbpf.c | 6 +++--- src/util/virbpf.h | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 95bc89ec52..790d52ec8d 100644 --- a/meson.build +++ b/meson.build @@ -647,7 +647,6 @@ symbols =3D [ if host_machine.system() =3D=3D 'linux' symbols +=3D [ # Check if we have new enough kernel to support BPF devices for cgroup= s v2 - [ 'linux/bpf.h', 'BPF_PROG_QUERY' ], [ 'linux/bpf.h', 'BPF_CGROUP_DEVICE' ], ] endif diff --git a/src/util/virbpf.c b/src/util/virbpf.c index 1169b99d07..34abf6f9b4 100644 --- a/src/util/virbpf.c +++ b/src/util/virbpf.c @@ -24,7 +24,7 @@ VIR_LOG_INIT("util.bpf"); =20 #define VIR_FROM_THIS VIR_FROM_BPF =20 -#if WITH_SYS_SYSCALL_H && WITH_DECL_BPF_PROG_QUERY +#ifdef __linux__ # include # include =20 @@ -292,7 +292,7 @@ virBPFDeleteElem(int mapfd, } =20 =20 -#else /* !WITH_SYS_SYSCALL_H || !WITH_DECL_BPF_PROG_QUERY */ +#else /* ! __linux__ */ =20 =20 int @@ -420,4 +420,4 @@ virBPFDeleteElem(int mapfd G_GNUC_UNUSED, errno =3D ENOSYS; return -1; } -#endif /* !WITH_SYS_SYSCALL_H || !WITH_DECL_BPF_PROG_QUERY */ +#endif /* !__linux__ */ diff --git a/src/util/virbpf.h b/src/util/virbpf.h index 1eafce86c0..cf21ac2d40 100644 --- a/src/util/virbpf.h +++ b/src/util/virbpf.h @@ -18,7 +18,7 @@ =20 #pragma once =20 -#if WITH_DECL_BPF_PROG_QUERY +#ifdef __linux__ =20 # include =20 @@ -171,7 +171,7 @@ .imm =3D 0, \ }) =20 -#else /* WITH_DECL_BPF_PROG_QUERY */ +#else /* ! __linux__ */ =20 struct bpf_prog_info; struct bpf_map_info; @@ -191,7 +191,7 @@ struct bpf_insn; # define VIR_BPF_CALL_INSN(func) # define VIR_BPF_EXIT_INSN() =20 -#endif /* WITH_DECL_BPF_PROG_QUERY */ +#endif /* ! __linux__ */ =20 int virBPFCreateMap(unsigned int mapType, --=20 2.38.1 From nobody Fri May 17 08:25:14 2024 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=1670510191; cv=none; d=zohomail.com; s=zohoarc; b=OkUGpmwEFRfAmViNw+evN4s9Xnj0OqMkKl6CAJvtBBF2P0yYOUHaib3mGDCiUZw0Z7Lg4Jy9zK44xztmhgn8qT3FX+H54l1fhTg1XZ8xBkofNoPGkBX7Mu+UjIJfPxKPxYo/VgvgvXzkYim+jYq7wJ0cjw9y/yNkBCW4OiiN4/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510191; 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=RmwqIgUmAFq0/WCcwip3ElsL0A8B0HDBaYhnXHUHEBo=; b=mrilbqRBkZBQa4yIyUMlrygVH5GyUyuwk1FuVMIEomniPFirpiEYPhV0NMWM5H+WmzJ8Wafck59FL+LpiFufQHNQp7Ad63QVUloUFLEOQrS98lwrW1rKZt72573cdpu1CbsHOc0UaB/IQbZxD1aBQvlpr7p1xKNBqOQNUv4u688= 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 1670510191662620.5871669606462; Thu, 8 Dec 2022 06:36:31 -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-45-9S1HCKPEOoa1hJQpxsbWBg-1; Thu, 08 Dec 2022 09:36:21 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 19AB680252D; Thu, 8 Dec 2022 14:35:53 +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 03B0E1121331; Thu, 8 Dec 2022 14:35:53 +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 CC1B0194704E; Thu, 8 Dec 2022 14:35:51 +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 33C5D1947B89 for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 67C852028E94; Thu, 8 Dec 2022 14:35:49 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id D71552023A1D; Thu, 8 Dec 2022 14:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510190; 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=RmwqIgUmAFq0/WCcwip3ElsL0A8B0HDBaYhnXHUHEBo=; b=d/FSxzV4QDsiKTr76gI4b0oskwb/M7YzmVgQQuGuYS+9I8eYniguwfyJTQHdZY3daJqqGP SSqGsHFp2Z3lDfMGuH0pqxqrcUAEnT9jGx+/EiiR8SuoROVOvwCJfVTzMhE5uiIFH03aDf hCHaqCIZQYjxGHh64aqudWgkyB4mhmM= X-MC-Unique: 9S1HCKPEOoa1hJQpxsbWBg-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 21/21] meson: remove obsolete check for BPF_CGROUP_DEVICE Date: Thu, 8 Dec 2022 14:35:25 +0000 Message-Id: <20221208143525.1731853-22-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.3 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: 1670510201025100001 The BPF_CGROUP_DEVICE constant was introduced to Linux in commit ebc614f687369f9df99828572b1d85a7c2de3d92 Author: Roman Gushchin Date: Sun Nov 5 08:15:32 2017 -0500 bpf, cgroup: implement eBPF-based device controller for cgroup v2 This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- meson.build | 7 ------- src/util/vircgroupv2devices.c | 10 +++++----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 790d52ec8d..e48e63ef01 100644 --- a/meson.build +++ b/meson.build @@ -644,13 +644,6 @@ symbols =3D [ [ 'sched.h', 'cpu_set_t' ], ] =20 -if host_machine.system() =3D=3D 'linux' - symbols +=3D [ - # Check if we have new enough kernel to support BPF devices for cgroup= s v2 - [ 'linux/bpf.h', 'BPF_CGROUP_DEVICE' ], - ] -endif - foreach symbol : symbols if cc.has_header_symbol(symbol[0], symbol[1], args: '-D_GNU_SOURCE', pre= fix: symbol.get(2, '')) conf.set('WITH_DECL_@0@'.format(symbol[1].to_upper()), 1) diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c index 1769c499c8..05818c4130 100644 --- a/src/util/vircgroupv2devices.c +++ b/src/util/vircgroupv2devices.c @@ -17,13 +17,13 @@ */ #include =20 -#if WITH_DECL_BPF_CGROUP_DEVICE +#if __linux__ # include # include # include # include # include -#endif /* !WITH_DECL_BPF_CGROUP_DEVICE */ +#endif /* __linux__ */ =20 #include "internal.h" =20 @@ -41,7 +41,7 @@ VIR_LOG_INIT("util.cgroup"); =20 #define VIR_FROM_THIS VIR_FROM_CGROUP =20 -#if WITH_DECL_BPF_CGROUP_DEVICE +#ifdef __linux__ bool virCgroupV2DevicesAvailable(virCgroup *group) { @@ -583,7 +583,7 @@ virCgroupV2DevicesGetPerms(int perms, =20 return ret; } -#else /* !WITH_DECL_BPF_CGROUP_DEVICE */ +#else /* !__linux__ */ bool virCgroupV2DevicesAvailable(virCgroup *group G_GNUC_UNUSED) { @@ -634,7 +634,7 @@ virCgroupV2DevicesGetPerms(int perms G_GNUC_UNUSED, { return 0; } -#endif /* !WITH_DECL_BPF_CGROUP_DEVICE */ +#endif /* !__linux__ */ =20 =20 uint64_t --=20 2.38.1