david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT

Browse Source 
to remove another dependency on qemu.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Samuel Thibault 2019-01-27 02:20:57 +01:00
parent 918f38d037
commit 85a0e43c45
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slirp/ip.h
View File

@ -229,7 +229,7 @@ struct ipasfrag {
struct ip ipf_ip; struct ip ipf_ip;
}; };
QEMU_BUILD_BUG_ON(offsetof(struct ipq, frag_link) != G_STATIC_ASSERT(offsetof(struct ipq, frag_link) ==
offsetof(struct ipasfrag, ipf_link)); offsetof(struct ipasfrag, ipf_link));
#define ipf_off ipf_ip.ip_off #define ipf_off ipf_ip.ip_off

4
slirp/ip6.h
View File

@ -152,7 +152,7 @@ struct ip6_pseudohdr {
* If we marked the struct as packed then we would be unable to take * If we marked the struct as packed then we would be unable to take
* the address of any of the fields in it. * the address of any of the fields in it.
*/ */
QEMU_BUILD_BUG_ON(sizeof(struct ip6) != 40); G_STATIC_ASSERT(sizeof(struct ip6) == 40);
QEMU_BUILD_BUG_ON(sizeof(struct ip6_pseudohdr) != 40); G_STATIC_ASSERT(sizeof(struct ip6_pseudohdr) == 40);
#endif #endif

10
slirp/ip6_icmp.h
View File

@ -50,14 +50,14 @@ struct ndp_ra { /* Router Advertisement Message */
uint32_t retrans_time; /* Retrans Timer */ 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 */ struct ndp_ns { /* Neighbor Solicitation Message */
uint32_t reserved; uint32_t reserved;
struct in6_addr target; /* Target Address */ 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 */ struct ndp_na { /* Neighbor Advertisement Message */
#if G_BYTE_ORDER == G_BIG_ENDIAN #if G_BYTE_ORDER == G_BIG_ENDIAN
@ -78,7 +78,7 @@ struct ndp_na { /* Neighbor Advertisement Message */
struct in6_addr target; /* Target Address */ 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 { struct ndp_redirect {
uint32_t reserved; uint32_t reserved;
@ -86,7 +86,7 @@ struct ndp_redirect {
struct in6_addr dest; /* Destination Address */ 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. * Structure of an icmpv6 header.
@ -113,7 +113,7 @@ struct icmp6 {
#define icmp6_redirect icmp6_body.ndp_redirect #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_MINLEN 4
#define ICMP6_ERROR_MINLEN 8 #define ICMP6_ERROR_MINLEN 8