bswap.h: Remove be32_to_cpupu()

Replace the legacy be32_to_cpupu() with ldl_be_p().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1383669517-25598-6-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@amazon.com>

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index ec8ecd7b94934532c8d77138cfcd41cf825f7618..a5fb8fc73ebfca5d11b585800a8812b82c03faf9 100644 (file)
--- 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 ac5b2e001e87360d78542f766e3346b6e7d1912a..9524931f8a4f49fdf6a73a291f3dc105cc77607e 100644 (file)
--- 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);