[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv3 23/32] slirp: replace QEMU_BUILD_BUG_ON with G_STAT
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULLv3 23/32] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT |
Date: |
Tue, 5 Feb 2019 20:28:39 +0200 |
to remove another dependency on qemu.
Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
---
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
- [Qemu-devel] [PULLv3 16/32] slirp: do not include qemu headers in libslirp.h public API header, (continued)
- [Qemu-devel] [PULLv3 16/32] slirp: do not include qemu headers in libslirp.h public API header, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 26/32] slirp: prefer c99 types over BSD kind, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 14/32] slirp: replace qemu_notify_event() with a callback, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 31/32] slirp: pass opaque to all callbacks, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 25/32] slirp: replace remaining qemu headers dependency, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 22/32] slirp: replace qemu qtailq with slirp own copy, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 27/32] slirp: improve send_packet() callback, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 17/32] slirp: improve windows headers inclusion, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 32/32] slirp: API is extern C, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 29/32] slirp: remove slirp_instances list, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 23/32] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT,
Samuel Thibault <=
- [Qemu-devel] [PULLv3 30/32] slirp: use polling callbacks, drop glib requirement, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 18/32] slirp: add slirp own version of pstrcpy, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 19/32] slirp: remove qemu timer.h dependency, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 15/32] slirp: move QEMU state saving to a separate unit, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv3 28/32] slirp: replace global polling with per-instance & notifier, Samuel Thibault, 2019/02/05
- Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp, no-reply, 2019/02/05
- Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp, no-reply, 2019/02/05
- Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp, Peter Maydell, 2019/02/07