|
 |
2e44a0f |
From ce317461573bac12b10d67699b4ddf1f97cf066c Mon Sep 17 00:00:00 2001
|
|
|
2e44a0f |
From: Jason Wang <jasowang@redhat.com>
|
|
|
2e44a0f |
Date: Fri, 25 Sep 2015 13:21:28 +0800
|
|
|
2e44a0f |
Subject: [PATCH] virtio: introduce virtqueue_unmap_sg()
|
|
|
2e44a0f |
|
|
|
2e44a0f |
Factor out sg unmapping logic. This will be reused by the patch that
|
|
|
2e44a0f |
can discard descriptor.
|
|
|
2e44a0f |
|
|
|
2e44a0f |
Cc: Michael S. Tsirkin <mst@redhat.com>
|
|
|
2e44a0f |
Cc: Andrew James <andrew.james@hpe.com>
|
|
|
2e44a0f |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
2e44a0f |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
2e44a0f |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
2e44a0f |
---
|
|
|
2e44a0f |
hw/virtio/virtio.c | 14 ++++++++++----
|
|
|
2e44a0f |
1 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
2e44a0f |
|
|
|
2e44a0f |
diff --git a/tools/qemu-xen/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
|
|
2e44a0f |
index 7504f8b..6f2b96c 100644
|
|
|
2e44a0f |
--- a/tools/qemu-xen/hw/virtio/virtio.c
|
|
|
2e44a0f |
+++ b/tools/qemu-xen/hw/virtio/virtio.c
|
|
|
2e44a0f |
@@ -244,14 +244,12 @@ int virtio_queue_empty(VirtQueue *vq)
|
|
|
2e44a0f |
return vring_avail_idx(vq) == vq->last_avail_idx;
|
|
|
2e44a0f |
}
|
|
|
2e44a0f |
|
|
|
2e44a0f |
-void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
|
|
|
2e44a0f |
- unsigned int len, unsigned int idx)
|
|
|
2e44a0f |
+static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
|
|
|
2e44a0f |
+ unsigned int len)
|
|
|
2e44a0f |
{
|
|
|
2e44a0f |
unsigned int offset;
|
|
|
2e44a0f |
int i;
|
|
|
2e44a0f |
|
|
|
2e44a0f |
- trace_virtqueue_fill(vq, elem, len, idx);
|
|
|
2e44a0f |
-
|
|
|
2e44a0f |
offset = 0;
|
|
|
2e44a0f |
for (i = 0; i < elem->in_num; i++) {
|
|
|
2e44a0f |
size_t size = MIN(len - offset, elem->in_sg[i].iov_len);
|
|
|
2e44a0f |
@@ -267,6 +265,14 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
|
|
|
2e44a0f |
cpu_physical_memory_unmap(elem->out_sg[i].iov_base,
|
|
|
2e44a0f |
elem->out_sg[i].iov_len,
|
|
|
2e44a0f |
0, elem->out_sg[i].iov_len);
|
|
|
2e44a0f |
+}
|
|
|
2e44a0f |
+
|
|
|
2e44a0f |
+void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
|
|
|
2e44a0f |
+ unsigned int len, unsigned int idx)
|
|
|
2e44a0f |
+{
|
|
|
2e44a0f |
+ trace_virtqueue_fill(vq, elem, len, idx);
|
|
|
2e44a0f |
+
|
|
|
2e44a0f |
+ virtqueue_unmap_sg(vq, elem, len);
|
|
|
2e44a0f |
|
|
|
2e44a0f |
idx = (idx + vring_used_idx(vq)) % vq->vring.num;
|
|
|
2e44a0f |
|
|
|
2e44a0f |
--
|
|
|
2e44a0f |
1.7.0.4
|
|
|
2e44a0f |
|