From 4071887b58defdb09e15359dd493475c3b2578d8 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 16 Jun 2016 18:17:24 +0100 Subject: hw/net/rocker: Don't use *_to_cpup() Don't use *_to_cpup() to do byte-swapped loads; instead use ld*_p() which correctly handle misaligned accesses. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Acked-by: Jason Wang Acked-by: Dmitry Fleytman > Message-id: 1466097446-981-4-git-send-email-peter.maydell@linaro.org --- hw/net/rocker/rocker_tlv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/net/rocker') diff --git a/hw/net/rocker/rocker_tlv.h b/hw/net/rocker/rocker_tlv.h index e3c4ab6..8856164 100644 --- a/hw/net/rocker/rocker_tlv.h +++ b/hw/net/rocker/rocker_tlv.h @@ -106,17 +106,17 @@ static inline uint64_t rocker_tlv_get_u64(const RockerTlv *tlv) static inline uint16_t rocker_tlv_get_le16(const RockerTlv *tlv) { - return le16_to_cpup((uint16_t *) rocker_tlv_data(tlv)); + return lduw_le_p(rocker_tlv_data(tlv)); } static inline uint32_t rocker_tlv_get_le32(const RockerTlv *tlv) { - return le32_to_cpup((uint32_t *) rocker_tlv_data(tlv)); + return ldl_le_p(rocker_tlv_data(tlv)); } static inline uint64_t rocker_tlv_get_le64(const RockerTlv *tlv) { - return le64_to_cpup((uint64_t *) rocker_tlv_data(tlv)); + return ldq_le_p(rocker_tlv_data(tlv)); } static inline void rocker_tlv_parse(RockerTlv **tb, int maxtype, -- cgit v1.1