Patchwork [3/4] virtio: use cpu_physical_memory_map_fast

login
register
mail settings
Submitter Paolo Bonzini
Date May 3, 2011, 4:49 p.m.
Message ID <1304441374-27314-4-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/93840/
State New
Headers show

Comments

Paolo Bonzini - May 3, 2011, 4:49 p.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/vhost.c  |   10 +++++-----
 hw/virtio.c |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/hw/vhost.c b/hw/vhost.c
index 14b571d..763ee4c 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -283,7 +283,7 @@  static int vhost_verify_ring_mappings(struct vhost_dev *dev,
             continue;
         }
         l = vq->ring_size;
-        p = cpu_physical_memory_map(vq->ring_phys, &l, 1);
+        p = cpu_physical_memory_map_fast(vq->ring_phys, &l);
         if (!p || l != vq->ring_size) {
             fprintf(stderr, "Unable to map ring buffer for ring %d\n", i);
             return -ENOMEM;
@@ -476,21 +476,21 @@  static int vhost_virtqueue_init(struct vhost_dev *dev,
 
     s = l = virtio_queue_get_desc_size(vdev, idx);
     a = virtio_queue_get_desc_addr(vdev, idx);
-    vq->desc = cpu_physical_memory_map(a, &l, 0);
+    vq->desc = cpu_physical_memory_map_fast(a, &l);
     if (!vq->desc || l != s) {
         r = -ENOMEM;
         goto fail_alloc_desc;
     }
     s = l = virtio_queue_get_avail_size(vdev, idx);
     a = virtio_queue_get_avail_addr(vdev, idx);
-    vq->avail = cpu_physical_memory_map(a, &l, 0);
+    vq->avail = cpu_physical_memory_map_fast(a, &l);
     if (!vq->avail || l != s) {
         r = -ENOMEM;
         goto fail_alloc_avail;
     }
     vq->used_size = s = l = virtio_queue_get_used_size(vdev, idx);
     vq->used_phys = a = virtio_queue_get_used_addr(vdev, idx);
-    vq->used = cpu_physical_memory_map(a, &l, 1);
+    vq->used = cpu_physical_memory_map_fast(a, &l);
     if (!vq->used || l != s) {
         r = -ENOMEM;
         goto fail_alloc_used;
@@ -498,7 +498,7 @@  static int vhost_virtqueue_init(struct vhost_dev *dev,
 
     vq->ring_size = s = l = virtio_queue_get_ring_size(vdev, idx);
     vq->ring_phys = a = virtio_queue_get_ring_addr(vdev, idx);
-    vq->ring = cpu_physical_memory_map(a, &l, 1);
+    vq->ring = cpu_physical_memory_map_fast(a, &l);
     if (!vq->ring || l != s) {
         r = -ENOMEM;
         goto fail_alloc_ring;
diff --git a/hw/virtio.c b/hw/virtio.c
index 6e8814c..429646a 100644
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -372,7 +372,7 @@  void virtqueue_map_sg(struct iovec *sg, target_phys_addr_t *addr,
 
     for (i = 0; i < num_sg; i++) {
         len = sg[i].iov_len;
-        sg[i].iov_base = cpu_physical_memory_map(addr[i], &len, is_write);
+        sg[i].iov_base = cpu_physical_memory_map_fast(addr[i], &len);
         if (sg[i].iov_base == NULL || len != sg[i].iov_len) {
             error_report("virtio: trying to map MMIO memory");
             exit(1);