Revision a8170e5e hw/vhost.c

b/hw/vhost.c
65 65

  
66 66
static int vhost_sync_dirty_bitmap(struct vhost_dev *dev,
67 67
                                   MemoryRegionSection *section,
68
                                   target_phys_addr_t start_addr,
69
                                   target_phys_addr_t end_addr)
68
                                   hwaddr start_addr,
69
                                   hwaddr end_addr)
70 70
{
71 71
    int i;
72 72

  
......
93 93
{
94 94
    struct vhost_dev *dev = container_of(listener, struct vhost_dev,
95 95
                                         memory_listener);
96
    target_phys_addr_t start_addr = section->offset_within_address_space;
97
    target_phys_addr_t end_addr = start_addr + section->size;
96
    hwaddr start_addr = section->offset_within_address_space;
97
    hwaddr end_addr = start_addr + section->size;
98 98

  
99 99
    vhost_sync_dirty_bitmap(dev, section, start_addr, end_addr);
100 100
}
......
296 296
    int i;
297 297
    for (i = 0; i < dev->nvqs; ++i) {
298 298
        struct vhost_virtqueue *vq = dev->vqs + i;
299
        target_phys_addr_t l;
299
        hwaddr l;
300 300
        void *p;
301 301

  
302 302
        if (!ranges_overlap(start_addr, size, vq->ring_phys, vq->ring_size)) {
......
362 362
{
363 363
    struct vhost_dev *dev = container_of(listener, struct vhost_dev,
364 364
                                         memory_listener);
365
    target_phys_addr_t start_addr = section->offset_within_address_space;
365
    hwaddr start_addr = section->offset_within_address_space;
366 366
    ram_addr_t size = section->size;
367 367
    bool log_dirty = memory_region_is_logging(section->mr);
368 368
    int s = offsetof(struct vhost_memory, regions) +
......
617 617
                                struct vhost_virtqueue *vq,
618 618
                                unsigned idx)
619 619
{
620
    target_phys_addr_t s, l, a;
620
    hwaddr s, l, a;
621 621
    int r;
622 622
    struct vhost_vring_file file = {
623 623
        .index = idx,
......
948 948
    }
949 949
    for (i = 0; i < hdev->n_mem_sections; ++i) {
950 950
        vhost_sync_dirty_bitmap(hdev, &hdev->mem_sections[i],
951
                                0, (target_phys_addr_t)~0x0ull);
951
                                0, (hwaddr)~0x0ull);
952 952
    }
953 953
    r = vdev->binding->set_guest_notifiers(vdev->binding_opaque, false);
954 954
    if (r < 0) {

Also available in: Unified diff