| Message ID | 1377442777-11066-5-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Sun, Aug 25, 2013 at 03:59:32PM +0100, Peter Maydell wrote: > Replace the legacy le32_to_cpupu() with ldl_le_p(). > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/net/ne2000.c | 2 +- > include/hw/pci/pci.h | 2 +- > include/qemu/bswap.h | 5 ----- > 3 files changed, 2 insertions(+), 7 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index e7865e9..5088e65 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -497,7 +497,7 @@ static inline uint32_t ne2000_mem_readl(NE2000State *s, uint32_t addr) addr &= ~1; /* XXX: check exact behaviour if not even */ if (addr < 32 || (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { - return le32_to_cpupu((uint32_t *)(s->mem + addr)); + return ldl_le_p(s->mem + addr); } else { return 0xffffffff; } diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index e5231df..76d67a4 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -440,7 +440,7 @@ pci_set_long(uint8_t *config, uint32_t val) static inline uint32_t pci_get_long(const uint8_t *config) { - return le32_to_cpupu((const uint32_t *)config); + return ldl_le_p(config); } static inline void diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 1c50002..ac5b2e0 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 le32_to_cpupu(const uint32_t *p) -{ - return ldl_le_p(p); -} - static inline uint32_t be32_to_cpupu(const uint32_t *p) { return ldl_be_p(p);
Replace the legacy le32_to_cpupu() with ldl_le_p(). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/net/ne2000.c | 2 +- include/hw/pci/pci.h | 2 +- include/qemu/bswap.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-)