diff options
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/alpha/tsunami_pchip.cc | 8 | ||||
| -rw-r--r-- | src/dev/arm/gic_v3_redistributor.cc | 8 | ||||
| -rw-r--r-- | src/dev/virtio/base.cc | 4 | ||||
| -rw-r--r-- | src/dev/virtio/base.hh | 8 |
4 files changed, 15 insertions, 13 deletions
diff --git a/src/dev/alpha/tsunami_pchip.cc b/src/dev/alpha/tsunami_pchip.cc index bf172209a..260d191ae 100644 --- a/src/dev/alpha/tsunami_pchip.cc +++ b/src/dev/alpha/tsunami_pchip.cc @@ -283,14 +283,16 @@ TsunamiPChip::dmaAddr(const PciBusAddr &dev, Addr busAddr) const to create an address for the SG page */ - tbaMask = ~(((wsm[i] & (ULL(0xfff) << 20)) >> 10) | ULL(0x3ff)); + tbaMask = ~(((wsm[i] & (ULL(0xfff) << 20)) >> 10) | + ULL(0x3ff)); baMask = (wsm[i] & (ULL(0xfff) << 20)) | (ULL(0x7f) << 13); pteAddr = (tba[i] & tbaMask) | ((busAddr & baMask) >> 10); - sys->physProxy.readBlob(pteAddr, (uint8_t*)&pteEntry, + sys->physProxy.readBlob(pteAddr, &pteEntry, sizeof(uint64_t)); - dmaAddr = ((pteEntry & ~ULL(0x1)) << 12) | (busAddr & ULL(0x1fff)); + dmaAddr = ((pteEntry & ~ULL(0x1)) << 12) | + (busAddr & ULL(0x1fff)); } else { baMask = (wsm[i] & (ULL(0xfff) << 20)) | ULL(0xfffff); diff --git a/src/dev/arm/gic_v3_redistributor.cc b/src/dev/arm/gic_v3_redistributor.cc index de6bd6389..37f169f19 100644 --- a/src/dev/arm/gic_v3_redistributor.cc +++ b/src/dev/arm/gic_v3_redistributor.cc @@ -815,11 +815,11 @@ Gicv3Redistributor::update() uint8_t lpi_config_table[number_lpis]; memProxy->readBlob(lpiPendingTablePtr, - (uint8_t *) lpi_pending_table, + lpi_pending_table, sizeof(lpi_pending_table)); memProxy->readBlob(lpiConfigurationTablePtr, - (uint8_t*) lpi_config_table, + lpi_config_table, sizeof(lpi_config_table)); for (int lpi_id = SMALLEST_LPI_ID; lpi_id < largest_lpi_id; @@ -869,7 +869,7 @@ Gicv3Redistributor::readEntryLPI(uint32_t lpi_id) uint8_t lpi_pending_entry; memProxy->readBlob(lpi_pending_entry_ptr, - (uint8_t*) &lpi_pending_entry, + &lpi_pending_entry, sizeof(lpi_pending_entry)); return lpi_pending_entry; @@ -881,7 +881,7 @@ Gicv3Redistributor::writeEntryLPI(uint32_t lpi_id, uint8_t lpi_pending_entry) Addr lpi_pending_entry_ptr = lpiPendingTablePtr + (lpi_id / 8); memProxy->writeBlob(lpi_pending_entry_ptr, - (uint8_t*) &lpi_pending_entry, + &lpi_pending_entry, sizeof(lpi_pending_entry)); } diff --git a/src/dev/virtio/base.cc b/src/dev/virtio/base.cc index 61dd3069f..347f5089f 100644 --- a/src/dev/virtio/base.cc +++ b/src/dev/virtio/base.cc @@ -81,7 +81,7 @@ VirtDescriptor::update() assert(_index < queue->getSize()); const Addr desc_addr(vq_addr + sizeof(desc) * _index); vring_desc guest_desc; - memProxy->readBlob(desc_addr, (uint8_t *)&guest_desc, sizeof(guest_desc)); + memProxy->readBlob(desc_addr, &guest_desc, sizeof(guest_desc)); desc = vtoh_legacy(guest_desc); DPRINTF(VIO, "VirtDescriptor(%i): Addr: 0x%x, Len: %i, Flags: 0x%x, " @@ -161,7 +161,7 @@ VirtDescriptor::write(size_t offset, const uint8_t *src, size_t size) if (!isOutgoing()) panic("Trying to write to incoming buffer\n"); - memProxy->writeBlob(desc.addr + offset, const_cast<uint8_t *>(src), size); + memProxy->writeBlob(desc.addr + offset, src, size); } void diff --git a/src/dev/virtio/base.hh b/src/dev/virtio/base.hh index ed3b1b431..f4c85afec 100644 --- a/src/dev/virtio/base.hh +++ b/src/dev/virtio/base.hh @@ -492,7 +492,7 @@ public: /** Update the ring buffer header with data from the guest. */ void readHeader() { assert(_base != 0); - _proxy.readBlob(_base, (uint8_t *)&header, sizeof(header)); + _proxy.readBlob(_base, &header, sizeof(header)); header.flags = vtoh_legacy(header.flags); header.index = vtoh_legacy(header.index); } @@ -502,7 +502,7 @@ public: assert(_base != 0); out.flags = htov_legacy(header.flags); out.index = htov_legacy(header.index); - _proxy.writeBlob(_base, (uint8_t *)&out, sizeof(out)); + _proxy.writeBlob(_base, &out, sizeof(out)); } void read() { @@ -511,7 +511,7 @@ public: /* Read and byte-swap the elements in the ring */ T temp[ring.size()]; _proxy.readBlob(_base + sizeof(header), - (uint8_t *)temp, sizeof(T) * ring.size()); + temp, sizeof(T) * ring.size()); for (int i = 0; i < ring.size(); ++i) ring[i] = vtoh_legacy(temp[i]); } @@ -524,7 +524,7 @@ public: for (int i = 0; i < ring.size(); ++i) temp[i] = htov_legacy(ring[i]); _proxy.writeBlob(_base + sizeof(header), - (uint8_t *)temp, sizeof(T) * ring.size()); + temp, sizeof(T) * ring.size()); writeHeader(); } |