From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qsqpx-00048J-UF for qemu-devel@nongnu.org; Mon, 15 Aug 2011 02:39:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qsqpw-0002yZ-Ki for qemu-devel@nongnu.org; Mon, 15 Aug 2011 02:39:49 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:55144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qsqpw-0002y9-8u for qemu-devel@nongnu.org; Mon, 15 Aug 2011 02:39:48 -0400 Message-ID: <4E48BF2F.7080901@web.de> Date: Sun, 14 Aug 2011 23:39:43 -0700 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig35460B3571CDF5B17332ED34" Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PULL] slirp: Fix issues with -mms-bitfields List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig35460B3571CDF5B17332ED34 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable The following changes since commit 3b6ffe50300f13240e1b46420ad05da1116df4= 10: hw/scsi-bus.c: Fix use of uninitialised variable (2011-08-14 19:34:25 += 0000) are available in the git repository at: git://git.kiszka.org/qemu.git queues/slirp Jan Kiszka (1): slirp: Fix bit field types in IP header structs slirp/ip.h | 8 ++++---- slirp/tcp.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) --- slirp: Fix bit field types in IP header structs -mms-bitfields prevents that the bitfields in current IP header structs are packed into a single byte as it is required. Fix this by using uint8_t as backing type. Signed-off-by: Jan Kiszka --- slirp/ip.h | 8 ++++---- slirp/tcp.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/slirp/ip.h b/slirp/ip.h index 48ea38e..72dbe9a 100644 --- a/slirp/ip.h +++ b/slirp/ip.h @@ -74,10 +74,10 @@ typedef uint32_t n_long; /* long as r= eceived from the net */ */ struct ip { #ifdef HOST_WORDS_BIGENDIAN - u_int ip_v:4, /* version */ + uint8_t ip_v:4, /* version */ ip_hl:4; /* header length */ #else - u_int ip_hl:4, /* header length */ + uint8_t ip_hl:4, /* header length */ ip_v:4; /* version */ #endif uint8_t ip_tos; /* type of service */ @@ -140,10 +140,10 @@ struct ip_timestamp { uint8_t ipt_len; /* size of structure (variable) */ uint8_t ipt_ptr; /* index of current entry */ #ifdef HOST_WORDS_BIGENDIAN - u_int ipt_oflw:4, /* overflow counter */ + uint8_t ipt_oflw:4, /* overflow counter */ ipt_flg:4; /* flags, see below */ #else - u_int ipt_flg:4, /* flags, see below */ + uint8_t ipt_flg:4, /* flags, see below */ ipt_oflw:4; /* overflow counter */ #endif union ipt_timestamp { diff --git a/slirp/tcp.h b/slirp/tcp.h index 9d06836..b3817cb 100644 --- a/slirp/tcp.h +++ b/slirp/tcp.h @@ -51,10 +51,10 @@ struct tcphdr { tcp_seq th_seq; /* sequence number */ tcp_seq th_ack; /* acknowledgement number */ #ifdef HOST_WORDS_BIGENDIAN - u_int th_off:4, /* data offset */ + uint8_t th_off:4, /* data offset */ th_x2:4; /* (unused) */ #else - u_int th_x2:4, /* (unused) */ + uint8_t th_x2:4, /* (unused) */ th_off:4; /* data offset */ #endif uint8_t th_flags; --------------enig35460B3571CDF5B17332ED34 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk5Ivy8ACgkQitSsb3rl5xQzPACfWt3UzKu1BAC0qcdSz7ijMKQ0 0ZQAn0xuyMmEzo3MuatAkWX6to+H4nkx =Z9DE -----END PGP SIGNATURE----- --------------enig35460B3571CDF5B17332ED34--