[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/9] bswap.h: Remove be32_to_cpupu()
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 5/9] bswap.h: Remove be32_to_cpupu() |
Date: |
Tue, 5 Nov 2013 16:38:33 +0000 |
Replace the legacy be32_to_cpupu() with ldl_be_p().
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
---
hw/net/e1000.c | 2 +-
include/qemu/bswap.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index ec8ecd7..a5fb8fc 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -603,7 +603,7 @@ xmit_seg(E1000State *s)
if (tp->tcp) {
sofar = frames * tp->mss;
cpu_to_be32wu((uint32_t *)(tp->data+css+4), // seq
- be32_to_cpupu((uint32_t *)(tp->data+css+4))+sofar);
+ ldl_be_p(tp->data+css+4)+sofar);
if (tp->paylen - sofar > tp->mss)
tp->data[css + 13] &= ~9; // PSH, FIN
} else // UDP
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index ac5b2e0..9524931 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -412,11 +412,6 @@ static inline void stfq_be_p(void *ptr, float64 v)
/* Legacy unaligned versions. Note that we never had a complete set. */
-static inline uint32_t be32_to_cpupu(const uint32_t *p)
-{
- return ldl_be_p(p);
-}
-
static inline void cpu_to_be16wu(uint16_t *p, uint16_t v)
{
stw_be_p(p, v);
--
1.7.9.5
- [Qemu-devel] [PATCH v2 0/9] Remove legacy unaligned bswap functions, Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 2/9] bswap.h: Remove cpu_to_le32wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 1/9] bswap.h: Remove cpu_to_le16wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 3/9] bswap.h: Remove le16_to_cpupu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 8/9] bswap.h: Remove cpu_to_be64wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 6/9] bswap.h: Remove cpu_to_be16wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 5/9] bswap.h: Remove be32_to_cpupu(),
Peter Maydell <=
- [Qemu-devel] [PATCH v2 4/9] bswap.h: Remove le32_to_cpupu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 7/9] bswap.h: Remove cpu_to_be32wu(), Peter Maydell, 2013/11/05
- [Qemu-devel] [PATCH v2 9/9] bswap.h: Remove cpu_to_32wu(), Peter Maydell, 2013/11/05
- Re: [Qemu-devel] [PATCH v2 0/9] Remove legacy unaligned bswap functions, Richard Henderson, 2013/11/05