From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdjeV-0002id-Vv for qemu-devel@nongnu.org; Tue, 05 Nov 2013 11:38:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdjeR-0006Yu-9B for qemu-devel@nongnu.org; Tue, 05 Nov 2013 11:38:51 -0500 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:50304 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdjeR-0006Xb-31 for qemu-devel@nongnu.org; Tue, 05 Nov 2013 11:38:47 -0500 From: Peter Maydell Date: Tue, 5 Nov 2013 16:38:33 +0000 Message-Id: <1383669517-25598-6-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1383669517-25598-1-git-send-email-peter.maydell@linaro.org> References: <1383669517-25598-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2 5/9] bswap.h: Remove be32_to_cpupu() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , "Michael S. Tsirkin" , patches@linaro.org, Stefan Hajnoczi , Richard Henderson Replace the legacy be32_to_cpupu() with ldl_be_p(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Michael S. Tsirkin --- 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