@@ -31,7 +31,7 @@ static void *vring_map(MemoryRegion **mr, hwaddr phys, hwaddr len,
{
MemoryRegionSection section = memory_region_find(get_system_memory(), phys, len);
- if (!section.mr || int128_get64(section.size) < len) {
+ if (!section.mr || uint128_to_64(section.size) < len) {
goto out;
}
if (is_write && section.readonly) {
@@ -84,7 +84,7 @@ static int vhost_sync_dirty_bitmap(struct vhost_dev *dev,
return 0;
}
start_addr = section->offset_within_address_space;
- end_addr = range_get_last(start_addr, int128_get64(section->size));
+ end_addr = range_get_last(start_addr, uint128_to_64(section->size));
start_addr = MAX(first, start_addr);
end_addr = MIN(last, end_addr);
@@ -417,7 +417,7 @@ static void vhost_set_memory(MemoryListener *listener,
struct vhost_dev *dev = container_of(listener, struct vhost_dev,
memory_listener);
hwaddr start_addr = section->offset_within_address_space;
- ram_addr_t size = int128_get64(section->size);
+ ram_addr_t size = uint128_to_64(section->size);
bool log_dirty =
memory_region_get_dirty_log_mask(section->mr) & ~(1 << DIRTY_MEMORY_MIGRATION);
int s = offsetof(struct vhost_memory, regions) +
@@ -220,7 +220,7 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq)
/* FIXME: remove get_system_memory(), but how? */
section = memory_region_find(get_system_memory(), pa, 1);
- if (!int128_nz(section.size) || !memory_region_is_ram(section.mr))
+ if (!uint128_nz(section.size) || !memory_region_is_ram(section.mr))
continue;
trace_virtio_balloon_handle_output(memory_region_name(section.mr),
Virtio uses 128 bit arithmetic for memory areas. Let's adapt to UInt128 bit arithmetic. Signed-off-by: Pierre Morel <pmorel@linux.vnet.ibm.com> --- hw/virtio/dataplane/vring.c | 2 +- hw/virtio/vhost.c | 4 ++-- hw/virtio/virtio-balloon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)