Attachment 314746 Details for Bug 344861 – additional proposed patch

[patch] additional proposed patch

e1000-fix-unaligned.patch (text/plain), 1.69 KB, created by Tetsu Yamamoto on 2008-08-21 19:55:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tetsu Yamamoto

Created: 2008-08-21 19:55:08 UTC

Size: 1.69 KB

patch

obsolete

>commit 88738c09ab04fb10dc63204cb02f8992a43d1de0
>Author: aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
>Date:   Fri Mar 28 22:30:48 2008 +0000
>
>    e1000: fix unaligned access
>    
>    (Tristan Gingold)
>    
>    
>    git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4121 c046a42c-6fe2-441c-8c8c-71466251a162
>
>diff --git a/bswap.h b/bswap.h
>index 970c1bb..523d805 100644
>--- a/bswap.h
>+++ b/bswap.h
>@@ -132,6 +132,7 @@ CPU_CONVERT(le, 64, uint64_t)
> #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) 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 @@ static inline uint32_t le32_to_cpupu(const uint32_t *p)
>     return p1[0] | (p1[1] << 8) | (p1[2] << 16) | (p1[3] << 24);
> }
> 
>+static inline uint32_t be32_to_cpupu(const uint32_t *p)
>+{
>+    const uint8_t *p1 = (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 = (uint8_t *)p;
>diff --git a/hw/e1000.c b/hw/e1000.c
>index 6e22ef9..8756d3b 100644
>--- a/hw/e1000.c
>+++ b/hw/e1000.c
>@@ -326,7 +326,7 @@ xmit_seg(E1000State *s)
>         if (tp->tcp) {
>             sofar = 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] &= ~9;		// PSH, FIN
>         } else	// UDP

Actions: View | Diff

Attachments on bug 344861: 314139 | 314746