From nobody Sat Feb 7 01:46:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154859018001762.93197652976801; Sun, 27 Jan 2019 03:56:20 -0800 (PST) Received: from localhost ([127.0.0.1]:44464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnj2w-0006He-FW for importer@patchew.org; Sun, 27 Jan 2019 06:56:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gniyz-0002p3-LX for qemu-devel@nongnu.org; Sun, 27 Jan 2019 06:52:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gniu5-0003vP-CM for qemu-devel@nongnu.org; Sun, 27 Jan 2019 06:47:10 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:42924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gniu4-0003sz-Sd for qemu-devel@nongnu.org; Sun, 27 Jan 2019 06:47:09 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 4B48C7CC7; Sun, 27 Jan 2019 12:47:05 +0100 (CET) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rI0SghR7NPnm; Sun, 27 Jan 2019 12:47:01 +0100 (CET) Received: from function (lfbn-1-11161-124.w86-213.abo.wanadoo.fr [86.213.235.124]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 825267CAB; Sun, 27 Jan 2019 12:47:01 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1gnitw-0003OK-AU; Sun, 27 Jan 2019 12:47:00 +0100 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sun, 27 Jan 2019 12:46:59 +0100 Message-Id: <20190127114659.12881-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lizhijian@cn.fujitsu.com, jan.kiszka@siemens.com, jasowang@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, zhangckid@gmail.com, Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Samuel Thibault Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson Reviewed-by: Stefano Garzarella --- slirp/ip.h | 4 ++-- slirp/ip6.h | 4 ++-- slirp/ip6_icmp.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/slirp/ip.h b/slirp/ip.h index 2baeeb9a3a..73a4d2a3d2 100644 --- a/slirp/ip.h +++ b/slirp/ip.h @@ -229,8 +229,8 @@ struct ipasfrag { struct ip ipf_ip; }; =20 -QEMU_BUILD_BUG_ON(offsetof(struct ipq, frag_link) !=3D - offsetof(struct ipasfrag, ipf_link)); +G_STATIC_ASSERT(offsetof(struct ipq, frag_link) =3D=3D + offsetof(struct ipasfrag, ipf_link)); =20 #define ipf_off ipf_ip.ip_off #define ipf_tos ipf_ip.ip_tos diff --git a/slirp/ip6.h b/slirp/ip6.h index 4e7c366505..5361bd7449 100644 --- a/slirp/ip6.h +++ b/slirp/ip6.h @@ -152,7 +152,7 @@ struct ip6_pseudohdr { * If we marked the struct as packed then we would be unable to take * the address of any of the fields in it. */ -QEMU_BUILD_BUG_ON(sizeof(struct ip6) !=3D 40); -QEMU_BUILD_BUG_ON(sizeof(struct ip6_pseudohdr) !=3D 40); +G_STATIC_ASSERT(sizeof(struct ip6) =3D=3D 40); +G_STATIC_ASSERT(sizeof(struct ip6_pseudohdr) =3D=3D 40); =20 #endif diff --git a/slirp/ip6_icmp.h b/slirp/ip6_icmp.h index 3f44ed2f49..e8ed753db5 100644 --- a/slirp/ip6_icmp.h +++ b/slirp/ip6_icmp.h @@ -50,14 +50,14 @@ struct ndp_ra { /* Router Advertisement Message */ uint32_t retrans_time; /* Retrans Timer */ }; =20 -QEMU_BUILD_BUG_ON(sizeof(struct ndp_ra) !=3D 12); +G_STATIC_ASSERT(sizeof(struct ndp_ra) =3D=3D 12); =20 struct ndp_ns { /* Neighbor Solicitation Message */ uint32_t reserved; struct in6_addr target; /* Target Address */ }; =20 -QEMU_BUILD_BUG_ON(sizeof(struct ndp_ns) !=3D 20); +G_STATIC_ASSERT(sizeof(struct ndp_ns) =3D=3D 20); =20 struct ndp_na { /* Neighbor Advertisement Message */ #if G_BYTE_ORDER =3D=3D G_BIG_ENDIAN @@ -78,7 +78,7 @@ struct ndp_na { /* Neighbor Advertisement Message */ struct in6_addr target; /* Target Address */ }; =20 -QEMU_BUILD_BUG_ON(sizeof(struct ndp_na) !=3D 20); +G_STATIC_ASSERT(sizeof(struct ndp_na) =3D=3D 20); =20 struct ndp_redirect { uint32_t reserved; @@ -86,7 +86,7 @@ struct ndp_redirect { struct in6_addr dest; /* Destination Address */ }; =20 -QEMU_BUILD_BUG_ON(sizeof(struct ndp_redirect) !=3D 36); +G_STATIC_ASSERT(sizeof(struct ndp_redirect) =3D=3D 36); =20 /* * Structure of an icmpv6 header. @@ -113,7 +113,7 @@ struct icmp6 { #define icmp6_redirect icmp6_body.ndp_redirect }; =20 -QEMU_BUILD_BUG_ON(sizeof(struct icmp6) !=3D 40); +G_STATIC_ASSERT(sizeof(struct icmp6) =3D=3D 40); =20 #define ICMP6_MINLEN 4 #define ICMP6_ERROR_MINLEN 8 --=20 2.20.1