From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go4GX-0006my-Jd for qemu-devel@nongnu.org; Mon, 28 Jan 2019 05:35:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go4GV-0003eM-LJ for qemu-devel@nongnu.org; Mon, 28 Jan 2019 05:35:45 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:44893) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1go4GS-0003a0-NU for qemu-devel@nongnu.org; Mon, 28 Jan 2019 05:35:41 -0500 Received: by mail-wr1-x444.google.com with SMTP id z5so17381279wrt.11 for ; Mon, 28 Jan 2019 02:35:39 -0800 (PST) References: <20190127114659.12881-1-samuel.thibault@ens-lyon.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <20190127114659.12881-1-samuel.thibault@ens-lyon.org> Date: Mon, 28 Jan 2019 10:35:37 +0000 Message-ID: <8736pdnk7a.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lizhijian@cn.fujitsu.com, jan.kiszka@siemens.com, jasowang@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, zhangckid@gmail.com, Samuel Thibault Samuel Thibault writes: > Signed-off-by: Samuel Thibault Is there a rationale as to why we should replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT or is it particular to these QEMU_BUILD_BUG_ON instances? It would be nice to have a little more context in the commit message. Otherwise the changes themselves look fine. > --- > 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; > }; > > -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)); > > #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); > > #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 */ > }; > > -QEMU_BUILD_BUG_ON(sizeof(struct ndp_ra) !=3D 12); > +G_STATIC_ASSERT(sizeof(struct ndp_ra) =3D=3D 12); > > struct ndp_ns { /* Neighbor Solicitation Message */ > uint32_t reserved; > struct in6_addr target; /* Target Address */ > }; > > -QEMU_BUILD_BUG_ON(sizeof(struct ndp_ns) !=3D 20); > +G_STATIC_ASSERT(sizeof(struct ndp_ns) =3D=3D 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 */ > }; > > -QEMU_BUILD_BUG_ON(sizeof(struct ndp_na) !=3D 20); > +G_STATIC_ASSERT(sizeof(struct ndp_na) =3D=3D 20); > > struct ndp_redirect { > uint32_t reserved; > @@ -86,7 +86,7 @@ struct ndp_redirect { > struct in6_addr dest; /* Destination Address */ > }; > > -QEMU_BUILD_BUG_ON(sizeof(struct ndp_redirect) !=3D 36); > +G_STATIC_ASSERT(sizeof(struct ndp_redirect) =3D=3D 36); > > /* > * Structure of an icmpv6 header. > @@ -113,7 +113,7 @@ struct icmp6 { > #define icmp6_redirect icmp6_body.ndp_redirect > }; > > -QEMU_BUILD_BUG_ON(sizeof(struct icmp6) !=3D 40); > +G_STATIC_ASSERT(sizeof(struct icmp6) =3D=3D 40); > > #define ICMP6_MINLEN 4 > #define ICMP6_ERROR_MINLEN 8 -- Alex Benn=C3=A9e