From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Jf2r8-0004Gx-QD
	for qemu-devel@nongnu.org; Thu, 27 Mar 2008 20:54:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Jf2r7-0004Cp-1A
	for qemu-devel@nongnu.org; Thu, 27 Mar 2008 20:54:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Jf2r6-0004Cf-T4
	for qemu-devel@nongnu.org; Thu, 27 Mar 2008 20:54:04 -0400
Received: from ecfrec.frec.bull.fr ([129.183.4.8])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <Laurent.Vivier@bull.net>) id 1Jf2r6-0002rd-AB
	for qemu-devel@nongnu.org; Thu, 27 Mar 2008 20:54:04 -0400
Subject: Re: [Qemu-devel] patch: e1000: fix unaligned access
From: Laurent Vivier <Laurent.Vivier@bull.net>
In-Reply-To: <1206633582.47ebc46ee1513@imp.free.fr>
References: <1206633582.47ebc46ee1513@imp.free.fr>
Content-Type: text/plain; charset=UTF-8
Date: Fri, 28 Mar 2008 01:56:36 +0100
Message-Id: <1206665796.4586.4.camel@frecb07144>
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Tristan Gingold <tgingold@free.fr>


Le jeudi 27 mars 2008 =C3=A0 16:59 +0100, tgingold@free.fr a =C3=A9crit :
> --- /home/gingold/src/qemu/bswap.h      2007-09-16 23:07:48.000000000
> +0200
> +++ qemu/bswap.h        2008-03-18 06:46:23.000000000 +0100
> @@ -132,6 +132,7 @@
>  #define cpu_to_le32wu(p, v) cpu_to_le32w(p, v)
>  #define le16_to_cpupu(p) le16_to_cpup(p)
>  #define le32_to_cpupu(p) le32_to_cpup(p)
> +#define be32_to_cpupu(p) le32_to_cpup(p)

should be "#define be32_to_cpupu(p) be32_to_cpup(p)" ?

>  #define cpu_to_be16wu(p, v) cpu_to_be16w(p, v)
>  #define cpu_to_be32wu(p, v) cpu_to_be32w(p, v)
> @@ -168,6 +169,12 @@
>      return p1[0] | (p1[1] << 8) | (p1[2] << 16) | (p1[3] << 24);
>  }
> =20
> +static inline uint32_t be32_to_cpupu(const uint32_t *p)
> +{
> +    const uint8_t *p1 =3D (const uint8_t *)p;
> +    return p1[3] | (p1[2] << 8) | (p1[1] << 16) | (p1[0] << 24);
> +}
> +
>  static inline void cpu_to_be16wu(uint16_t *p, uint16_t v)
>  {
>      uint8_t *p1 =3D (uint8_t *)p;
> --- /home/gingold/src/qemu/hw/e1000.c   2008-03-13 20:18:26.000000000
> +0100
> +++ qemu/hw/e1000.c     2008-03-27 07:11:48.000000000 +0100
> @@ -326,7 +326,7 @@
>          if (tp->tcp) {
>              sofar =3D frames * tp->mss;
>              cpu_to_be32wu((uint32_t *)(tp->data+css+4),        // seq
> -                be32_to_cpup((uint32_t *)(tp->data+css+4))+sofar);
> +                be32_to_cpupu((uint32_t *)(tp->data+css+4))+sofar);
>              if (tp->paylen - sofar > tp->mss)
>                  tp->data[css + 13] &=3D ~9;              // PSH, FIN
>          } else // UDP
>=20
--=20
------------- Laurent.Vivier@bull.net ---------------
"The best way to predict the future is to invent it."
- Alan Kay