From nobody Tue Feb 10 19:47:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622536860; cv=none; d=zohomail.com; s=zohoarc; b=K/ADwlPY8ITBGEpfYKhOREuCtboK4p8wTHMIwPXc7vDi3o/9BCZVY6I3vpDe4TEJ0p19lb24+ujHm+UIlyDAehFOuxZcXbVlnGXke8an9ITImfZZ9w9Kbwsy97nTAyG+as9xgRQUDB4bBLXxdXR7S84BvkoyNP+vCL9fPnAgQw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622536860; 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=oF6mn58h2WotpjlsmYXypIgpmc3DdnkptbExQqtxgwc=; b=fBaAthTLcIlGZ0tsO61BJESRJXxt+YzHbw/S38kNn0Tmlles5HJAP57Q8CPnWpPHSgskDqnOfMmueHtHR3ymjI6f2/1rx9o0hivmsNCx5sgA6bjkAY2q3XN38EY9zx86cxWJIzoBgPNQOLCGFRp0AaFT7Hv6FG0eJyx5XasG1wY= 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) header.from= 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 1622536860094713.8118786284545; Tue, 1 Jun 2021 01:41:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-223-Y9qLUYUVOpmWW-bS97dgSA-1; Tue, 01 Jun 2021 04:38:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1E4DBBEE6; Tue, 1 Jun 2021 08:38:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC1FA100763C; Tue, 1 Jun 2021 08:38:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 701EF44A5C; Tue, 1 Jun 2021 08:38:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1518c9NZ025968 for ; Tue, 1 Jun 2021 04:38:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 503AAE2D8; Tue, 1 Jun 2021 08:38:09 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD1BEE2D4 for ; Tue, 1 Jun 2021 08:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622536857; 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=oF6mn58h2WotpjlsmYXypIgpmc3DdnkptbExQqtxgwc=; b=RC01Dcw/T63Dwed7D7iAq22jT5ipHre9ucpMwI+OF2/AxEP+NV0pG21Mi7tJ5e1loh34aL i/dkECaCpEhbO8hBXWarIzPYkBWHfQuOr0qY1cqSSQpqDZ1gObM1/q/CQMkuhqgppjn/nx Muo5vtdMekZ9nOAzMlwnKAuW0TqC4mQ= X-MC-Unique: Y9qLUYUVOpmWW-bS97dgSA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 05/26] meson: Drop netinet workaround Date: Tue, 1 Jun 2021 10:37:36 +0200 Message-Id: <20210601083757.10194-6-abologna@redhat.com> In-Reply-To: <20210601083757.10194-1-abologna@redhat.com> References: <20210601083757.10194-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It appears to no longer be necessary. Signed-off-by: Andrea Bolognani --- meson.build | 16 ---------------- src/util/virnetdevbridge.c | 18 ------------------ 2 files changed, 34 deletions(-) diff --git a/meson.build b/meson.build index 1360dd325e..9c494faa5c 100644 --- a/meson.build +++ b/meson.build @@ -622,22 +622,6 @@ endforeach =20 # check for kernel headers required by src/util/virnetdevbridge.c if host_machine.system() =3D=3D 'linux' - # Various kernel versions have headers that are not self-standing, but - # yet are incompatible with the corresponding glibc headers. In order - # to guarantee compilation across a wide range of versions (from RHEL 5 - # to rawhide), we first have to probe whether glibc and kernel can be - # used in tandem; and if not, provide workarounds that ensure that - # ABI-compatible IPv6 types are present for use by the kernel headers. - netinet_workaround_code =3D ''' - #include - #include - - int main(void) { return 0; } - ''' - if not cc.compiles(netinet_workaround_code) - conf.set('NETINET_LINUX_WORKAROUND', 1) - endif - required_headers =3D [ 'linux/param.h', 'linux/sockios.h', diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 4fe84cc162..a9667b48ce 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -37,26 +37,8 @@ # endif # include # include /* HZ */ -# if NETINET_LINUX_WORKAROUND -/* Depending on the version of kernel vs. glibc, there may be a collision - * between and kernel IPv6 structures. The different types - * are ABI compatible, but choke the C type system; work around it by - * using temporary redefinitions. */ -# define in6_addr in6_addr_ -# define sockaddr_in6 sockaddr_in6_ -# define ipv6_mreq ipv6_mreq_ -# define in6addr_any in6addr_any_ -# define in6addr_loopback in6addr_loopback_ -# endif # include # include /* SYSFS_BRIDGE_ATTR */ -# if NETINET_LINUX_WORKAROUND -# undef in6_addr -# undef sockaddr_in6 -# undef ipv6_mreq -# undef in6addr_any -# undef in6addr_loopback -# endif =20 # define JIFFIES_TO_MS(j) (((j)*1000)/HZ) # define MS_TO_JIFFIES(ms) (((ms)*HZ)/1000) --=20 2.31.1