From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHInB-0002V3-TD for qemu-devel@nongnu.org; Tue, 03 May 2011 12:49:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QHInA-0008Oy-N7 for qemu-devel@nongnu.org; Tue, 03 May 2011 12:49:45 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:39017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHInA-0008Nw-CW for qemu-devel@nongnu.org; Tue, 03 May 2011 12:49:44 -0400 Received: by mail-ww0-f53.google.com with SMTP id 40so288615wwj.10 for ; Tue, 03 May 2011 09:49:43 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 May 2011 18:49:33 +0200 Message-Id: <1304441374-27314-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1304441374-27314-1-git-send-email-pbonzini@redhat.com> References: <1304441374-27314-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] virtio: use cpu_physical_memory_map_fast List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- hw/vhost.c | 10 +++++----- hw/virtio.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) 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); -- 1.7.4.4