[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/22] virtio: introduce virtqueue_unmap_sg()
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 20/22] virtio: introduce virtqueue_unmap_sg() |
Date: |
Thu, 24 Sep 2015 16:21:02 +0300 |
From: Jason Wang <address@hidden>
Factor out sg unmapping logic. This will be reused by the patch that
can discard descriptor.
Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/virtio.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 7504f8b..d6a2bca 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -244,15 +244,12 @@ int virtio_queue_empty(VirtQueue *vq)
return vring_avail_idx(vq) == vq->last_avail_idx;
}
-void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
- unsigned int len, unsigned int idx)
+static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
+ unsigned int len)
{
unsigned int offset;
int i;
- trace_virtqueue_fill(vq, elem, len, idx);
-
- offset = 0;
for (i = 0; i < elem->in_num; i++) {
size_t size = MIN(len - offset, elem->in_sg[i].iov_len);
@@ -267,6 +264,14 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement
*elem,
cpu_physical_memory_unmap(elem->out_sg[i].iov_base,
elem->out_sg[i].iov_len,
0, elem->out_sg[i].iov_len);
+}
+
+void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
+ unsigned int len, unsigned int idx)
+{
+ trace_virtqueue_fill(vq, elem, len, idx);
+
+ virtqueue_unmap_sg(vq, elem, len);
idx = (idx + vring_used_idx(vq)) % vq->vring.num;
--
MST
- [Qemu-devel] [PULL 06/22] virtio: ring sizes vs. reset, (continued)
- [Qemu-devel] [PULL 06/22] virtio: ring sizes vs. reset, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 07/22] virtio-ccw: support ring size changes, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 08/22] virtio-ccw: feature bits > 31 handling, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 09/22] virtio-ccw: enable virtio-1, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 10/22] vhost-user: use VHOST_USER_XXX macro for switch statement, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 11/22] vhost-user: add protocol feature negotiation, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 12/22] vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 19/22] MAINTAINERS: add more devices to the PCI section, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 21/22] virtio: introduce virtqueue_discard(), Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 22/22] virtio-net: correctly drop truncated packets, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 20/22] virtio: introduce virtqueue_unmap_sg(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 14/22] vhost: introduce vhost_backend_get_vq_index method, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 18/22] MAINTAINERS: add more devices to the PC section, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 15/22] vhost-user: add multiple queue support, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 17/22] intel_iommu: Add support for translation for devices behind bridges, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 01/22] virtio: right size for virtio_queue_get_avail_size, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 16/22] vhost-user: add a new message to disable/enable a specific virt queue., Michael S. Tsirkin, 2015/09/24