From: Peter Maydell Date: Tue, 5 Nov 2013 16:38:33 +0000 (+0000) Subject: bswap.h: Remove be32_to_cpupu() X-Git-Tag: qemu-xen-4.5.0-rc1~375 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=09fa8439730c707b34af6ab055fc353f6cadc57d;p=qemu-upstream-4.5-testing.git bswap.h: Remove be32_to_cpupu() Replace the legacy be32_to_cpupu() with ldl_be_p(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Michael S. Tsirkin Message-id: 1383669517-25598-6-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori --- diff --git a/hw/net/e1000.c b/hw/net/e1000.c index ec8ecd7b9..a5fb8fc73 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 ac5b2e001..9524931f8 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);