Commit 85a0e43c authored by Samuel Thibault's avatar Samuel Thibault
Browse files

slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT 



to remove another dependency on qemu.

Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent 918f38d0

slirp/ip.h

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ struct ipasfrag { 
	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));



#define ipf_off      ipf_ip.ip_off

slirp/ip6.h

+2 −2
Original line number Diff line number Diff line
@@ -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

slirp/ip6_icmp.h

+5 −5
Original line number Diff line number Diff line
@@ -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