[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 05/16] virtio: add memory region init for packed
From: |
wexu |
Subject: |
[Qemu-devel] [PATCH v1 05/16] virtio: add memory region init for packed ring |
Date: |
Thu, 22 Nov 2018 09:06:10 -0500 |
From: Wei Xu <address@hidden>
Signed-off-by: Wei Xu <address@hidden>
---
hw/virtio/virtio.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index a41c2d3..99565c6 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -156,10 +156,8 @@ static void virtio_init_region_cache(VirtIODevice *vdev,
int n)
VRingMemoryRegionCaches *old = vq->vring.caches;
VRingMemoryRegionCaches *new = NULL;
hwaddr addr, size;
- int event_size;
int64_t len;
-
- event_size = virtio_vdev_has_feature(vq->vdev, VIRTIO_RING_F_EVENT_IDX) ?
2 : 0;
+ bool attr;
addr = vq->vring.desc;
if (!addr) {
@@ -167,14 +165,16 @@ static void virtio_init_region_cache(VirtIODevice *vdev,
int n)
}
new = g_new0(VRingMemoryRegionCaches, 1);
size = virtio_queue_get_desc_size(vdev, n);
+ attr = virtio_vdev_has_feature(vq->vdev, VIRTIO_F_RING_PACKED) ?
+ true : false;
len = address_space_cache_init(&new->desc, vdev->dma_as,
- addr, size, false);
+ addr, size, attr);
if (len < size) {
virtio_error(vdev, "Cannot map desc");
goto err_desc;
}
- size = virtio_queue_get_used_size(vdev, n) + event_size;
+ size = virtio_queue_get_used_size(vdev, n);
len = address_space_cache_init(&new->used, vdev->dma_as,
vq->vring.used, size, true);
if (len < size) {
@@ -182,7 +182,7 @@ static void virtio_init_region_cache(VirtIODevice *vdev,
int n)
goto err_used;
}
- size = virtio_queue_get_avail_size(vdev, n) + event_size;
+ size = virtio_queue_get_avail_size(vdev, n);
len = address_space_cache_init(&new->avail, vdev->dma_as,
vq->vring.avail, size, false);
if (len < size) {
--
1.8.3.1
- [Qemu-devel] [PATCH v1 00/16] packed ring virtio-net backend support, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 01/16] Update version for v3.1.0-rc2 release, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 02/16] virtio: introduce packed ring definitions, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 03/16] virtio: redefine structure & memory cache for packed ring, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 04/16] virtio: expand offset calculation for packed ring, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 05/16] virtio: add memory region init for packed ring,
wexu <=
- [Qemu-devel] [PATCH v1 06/16] virtio: init wrap counter for packed ring, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 07/16] virtio: init and desc empty check for packed ring, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 08/16] virtio: get avail bytes check for packed ring, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 09/16] virtio: fill/flush/pop for packed ring, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 10/16] virtio: event suppression support for packed ring, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 12/16] virtio: add userspace migration of packed ring, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 11/16] virtio-net: fill head desc after done all in a chain, wexu, 2018/11/22
- [Qemu-devel] [PATCH v1 13/16] virtio: add vhost-net migration of packed ring, wexu, 2018/11/22