* [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
@ 2019-01-27 11:46 Samuel Thibault
2019-01-27 12:02 ` Marc-André Lureau
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Samuel Thibault @ 2019-01-27 11:46 UTC (permalink / raw)
To: qemu-devel
Cc: Samuel Thibault, lizhijian, jan.kiszka, jasowang, stefanha,
zhangckid, pbonzini
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
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) !=
- offsetof(struct ipasfrag, ipf_link));
+G_STATIC_ASSERT(offsetof(struct ipq, frag_link) ==
+ 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) != 40);
-QEMU_BUILD_BUG_ON(sizeof(struct ip6_pseudohdr) != 40);
+G_STATIC_ASSERT(sizeof(struct ip6) == 40);
+G_STATIC_ASSERT(sizeof(struct ip6_pseudohdr) == 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) != 12);
+G_STATIC_ASSERT(sizeof(struct ndp_ra) == 12);
struct ndp_ns { /* Neighbor Solicitation Message */
uint32_t reserved;
struct in6_addr target; /* Target Address */
};
-QEMU_BUILD_BUG_ON(sizeof(struct ndp_ns) != 20);
+G_STATIC_ASSERT(sizeof(struct ndp_ns) == 20);
struct ndp_na { /* Neighbor Advertisement Message */
#if G_BYTE_ORDER == 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) != 20);
+G_STATIC_ASSERT(sizeof(struct ndp_na) == 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) != 36);
+G_STATIC_ASSERT(sizeof(struct ndp_redirect) == 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) != 40);
+G_STATIC_ASSERT(sizeof(struct icmp6) == 40);
#define ICMP6_MINLEN 4
#define ICMP6_ERROR_MINLEN 8
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
2019-01-27 11:46 [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT Samuel Thibault
@ 2019-01-27 12:02 ` Marc-André Lureau
2019-01-27 19:11 ` Richard Henderson
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Marc-André Lureau @ 2019-01-27 12:02 UTC (permalink / raw)
To: Samuel Thibault
Cc: QEMU, Li Zhijian, Jan Kiszka, Jason Wang, Paolo Bonzini,
Stefan Hajnoczi, Zhang Chen
On Sun, Jan 27, 2019 at 3:56 PM Samuel Thibault
<samuel.thibault@ens-lyon.org> wrote:
>
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> 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) !=
> - offsetof(struct ipasfrag, ipf_link));
> +G_STATIC_ASSERT(offsetof(struct ipq, frag_link) ==
> + 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) != 40);
> -QEMU_BUILD_BUG_ON(sizeof(struct ip6_pseudohdr) != 40);
> +G_STATIC_ASSERT(sizeof(struct ip6) == 40);
> +G_STATIC_ASSERT(sizeof(struct ip6_pseudohdr) == 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) != 12);
> +G_STATIC_ASSERT(sizeof(struct ndp_ra) == 12);
>
> struct ndp_ns { /* Neighbor Solicitation Message */
> uint32_t reserved;
> struct in6_addr target; /* Target Address */
> };
>
> -QEMU_BUILD_BUG_ON(sizeof(struct ndp_ns) != 20);
> +G_STATIC_ASSERT(sizeof(struct ndp_ns) == 20);
>
> struct ndp_na { /* Neighbor Advertisement Message */
> #if G_BYTE_ORDER == 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) != 20);
> +G_STATIC_ASSERT(sizeof(struct ndp_na) == 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) != 36);
> +G_STATIC_ASSERT(sizeof(struct ndp_redirect) == 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) != 40);
> +G_STATIC_ASSERT(sizeof(struct icmp6) == 40);
>
> #define ICMP6_MINLEN 4
> #define ICMP6_ERROR_MINLEN 8
> --
> 2.20.1
>
>
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
2019-01-27 11:46 [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT Samuel Thibault
2019-01-27 12:02 ` Marc-André Lureau
@ 2019-01-27 19:11 ` Richard Henderson
2019-01-28 8:31 ` Stefano Garzarella
2019-01-28 10:35 ` Alex Bennée
3 siblings, 0 replies; 7+ messages in thread
From: Richard Henderson @ 2019-01-27 19:11 UTC (permalink / raw)
To: Samuel Thibault, qemu-devel
Cc: lizhijian, jan.kiszka, jasowang, pbonzini, stefanha, zhangckid
On 1/27/19 3:46 AM, Samuel Thibault wrote:
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> ---
> slirp/ip.h | 4 ++--
> slirp/ip6.h | 4 ++--
> slirp/ip6_icmp.h | 10 +++++-----
> 3 files changed, 9 insertions(+), 9 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
2019-01-27 11:46 [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT Samuel Thibault
2019-01-27 12:02 ` Marc-André Lureau
2019-01-27 19:11 ` Richard Henderson
@ 2019-01-28 8:31 ` Stefano Garzarella
2019-01-28 10:35 ` Alex Bennée
3 siblings, 0 replies; 7+ messages in thread
From: Stefano Garzarella @ 2019-01-28 8:31 UTC (permalink / raw)
To: Samuel Thibault
Cc: qemu-devel, lizhijian, jan.kiszka, jasowang, pbonzini, stefanha,
zhangckid
On Sun, Jan 27, 2019 at 12:46:59PM +0100, Samuel Thibault wrote:
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> ---
> slirp/ip.h | 4 ++--
> slirp/ip6.h | 4 ++--
> slirp/ip6_icmp.h | 10 +++++-----
> 3 files changed, 9 insertions(+), 9 deletions(-)
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Thanks,
Stefano
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
2019-01-27 11:46 [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT Samuel Thibault
` (2 preceding siblings ...)
2019-01-28 8:31 ` Stefano Garzarella
@ 2019-01-28 10:35 ` Alex Bennée
2019-01-28 10:39 ` Samuel Thibault
3 siblings, 1 reply; 7+ messages in thread
From: Alex Bennée @ 2019-01-28 10:35 UTC (permalink / raw)
To: qemu-devel
Cc: lizhijian, jan.kiszka, jasowang, pbonzini, stefanha, zhangckid,
Samuel Thibault
Samuel Thibault <samuel.thibault@ens-lyon.org> writes:
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
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) !=
> - offsetof(struct ipasfrag, ipf_link));
> +G_STATIC_ASSERT(offsetof(struct ipq, frag_link) ==
> + 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) != 40);
> -QEMU_BUILD_BUG_ON(sizeof(struct ip6_pseudohdr) != 40);
> +G_STATIC_ASSERT(sizeof(struct ip6) == 40);
> +G_STATIC_ASSERT(sizeof(struct ip6_pseudohdr) == 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) != 12);
> +G_STATIC_ASSERT(sizeof(struct ndp_ra) == 12);
>
> struct ndp_ns { /* Neighbor Solicitation Message */
> uint32_t reserved;
> struct in6_addr target; /* Target Address */
> };
>
> -QEMU_BUILD_BUG_ON(sizeof(struct ndp_ns) != 20);
> +G_STATIC_ASSERT(sizeof(struct ndp_ns) == 20);
>
> struct ndp_na { /* Neighbor Advertisement Message */
> #if G_BYTE_ORDER == 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) != 20);
> +G_STATIC_ASSERT(sizeof(struct ndp_na) == 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) != 36);
> +G_STATIC_ASSERT(sizeof(struct ndp_redirect) == 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) != 40);
> +G_STATIC_ASSERT(sizeof(struct icmp6) == 40);
>
> #define ICMP6_MINLEN 4
> #define ICMP6_ERROR_MINLEN 8
--
Alex Bennée
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
2019-01-28 10:35 ` Alex Bennée
@ 2019-01-28 10:39 ` Samuel Thibault
2019-01-28 11:07 ` Alex Bennée
0 siblings, 1 reply; 7+ messages in thread
From: Samuel Thibault @ 2019-01-28 10:39 UTC (permalink / raw)
To: Alex Bennée
Cc: qemu-devel, lizhijian, jan.kiszka, jasowang, pbonzini, stefanha,
zhangckid
Alex Bennée, le lun. 28 janv. 2019 10:35:37 +0000, a ecrit:
> Samuel Thibault <samuel.thibault@ens-lyon.org> writes:
>
> > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
>
> 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.
It is yet more work towards moving slirp/ to a separately-maintained
libslirp.
Samuel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
2019-01-28 10:39 ` Samuel Thibault
@ 2019-01-28 11:07 ` Alex Bennée
0 siblings, 0 replies; 7+ messages in thread
From: Alex Bennée @ 2019-01-28 11:07 UTC (permalink / raw)
To: Samuel Thibault
Cc: qemu-devel, lizhijian, jan.kiszka, jasowang, pbonzini, stefanha,
zhangckid
Samuel Thibault <samuel.thibault@gnu.org> writes:
> Alex Bennée, le lun. 28 janv. 2019 10:35:37 +0000, a ecrit:
>> Samuel Thibault <samuel.thibault@ens-lyon.org> writes:
>>
>> > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
>>
>> 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.
>
> It is yet more work towards moving slirp/ to a separately-maintained
> libslirp.
thanks, that makes more sense. If you could just mention that in the
commit it would save confusion about QEMU_BUILD_BUG_ON being deprecated
;-)
With that:
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
--
Alex Bennée
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-01-28 11:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-27 11:46 [Qemu-devel] [PATCH] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT Samuel Thibault
2019-01-27 12:02 ` Marc-André Lureau
2019-01-27 19:11 ` Richard Henderson
2019-01-28 8:31 ` Stefano Garzarella
2019-01-28 10:35 ` Alex Bennée
2019-01-28 10:39 ` Samuel Thibault
2019-01-28 11:07 ` Alex Bennée
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.