diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-11-05 16:38:35 +0000 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-05 19:57:47 -0800 |
| commit | 6bd194ab9957361f83fdbfb22d452d97b4af28e2 (patch) | |
| tree | 195880149fddce3aec061fa94f4dc0499f25413c | |
| parent | d8ee2591e495d5feb0e0250866222dedc805c8d8 (diff) | |
| download | qemu-6bd194ab9957361f83fdbfb22d452d97b4af28e2.tar.gz | |
bswap.h: Remove cpu_to_be32wu()
Replace the legacy cpu_to_be32wu() with stl_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-8-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
| -rw-r--r-- | hw/block/cdrom.c | 6 | ||||
| -rw-r--r-- | hw/net/e1000.c | 3 | ||||
| -rw-r--r-- | hw/pci/pcie_aer.c | 4 | ||||
| -rw-r--r-- | include/qemu/bswap.h | 5 |
4 files changed, 6 insertions, 12 deletions
diff --git a/hw/block/cdrom.c b/hw/block/cdrom.c index 5c69f34f2e..4e1019c890 100644 --- a/hw/block/cdrom.c +++ b/hw/block/cdrom.c @@ -59,7 +59,7 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track) q += 3; } else { /* sector 0 */ - cpu_to_be32wu((uint32_t *)q, 0); + stl_be_p(q, 0); q += 4; } } @@ -73,7 +73,7 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track) lba_to_msf(q, nb_sectors); q += 3; } else { - cpu_to_be32wu((uint32_t *)q, nb_sectors); + stl_be_p(q, nb_sectors); q += 4; } len = q - buf; @@ -127,7 +127,7 @@ int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num) lba_to_msf(q, nb_sectors); q += 3; } else { - cpu_to_be32wu((uint32_t *)q, nb_sectors); + stl_be_p(q, nb_sectors); q += 4; } diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 34ac625913..8387443ee3 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -599,8 +599,7 @@ xmit_seg(E1000State *s) DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", tp->tcp, css, len); if (tp->tcp) { sofar = frames * tp->mss; - cpu_to_be32wu((uint32_t *)(tp->data+css+4), // seq - ldl_be_p(tp->data+css+4)+sofar); + stl_be_p(tp->data+css+4, ldl_be_p(tp->data+css+4)+sofar); /* seq */ if (tp->paylen - sofar > tp->mss) tp->data[css + 13] &= ~9; // PSH, FIN } else // UDP diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index 32aa0c61b5..991502e517 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -425,7 +425,7 @@ static void pcie_aer_update_log(PCIDevice *dev, const PCIEAERErr *err) /* 7.10.8 Header Log Register */ uint8_t *header_log = aer_cap + PCI_ERR_HEADER_LOG + i * sizeof err->header[0]; - cpu_to_be32wu((uint32_t*)header_log, err->header[i]); + stl_be_p(header_log, err->header[i]); } } else { assert(!(err->flags & PCIE_AER_ERR_TLP_PREFIX_PRESENT)); @@ -439,7 +439,7 @@ static void pcie_aer_update_log(PCIDevice *dev, const PCIEAERErr *err) /* 7.10.12 tlp prefix log register */ uint8_t *prefix_log = aer_cap + PCI_ERR_TLP_PREFIX_LOG + i * sizeof err->prefix[0]; - cpu_to_be32wu((uint32_t*)prefix_log, err->prefix[i]); + stl_be_p(prefix_log, err->prefix[i]); } errcap |= PCI_ERR_CAP_TLP; } else { diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 3bb6b71cff..b95cc73859 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 void cpu_to_be32wu(uint32_t *p, uint32_t v) -{ - stl_be_p(p, v); -} - static inline void cpu_to_be64wu(uint64_t *p, uint64_t v) { stq_be_p(p, v); |