[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 04/16] virtio: expand offset calculation for pack
From: |
wexu |
Subject: |
[Qemu-devel] [PATCH v1 04/16] virtio: expand offset calculation for packed ring |
Date: |
Thu, 22 Nov 2018 09:06:09 -0500 |
From: Wei Xu <address@hidden>
Expand 1.0 to 1.1 by adding offset calculation accordingly.
Signed-off-by: Wei Xu <address@hidden>
---
hw/virtio/virtio.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index a8e737c..a41c2d3 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -2336,14 +2336,28 @@ hwaddr virtio_queue_get_desc_size(VirtIODevice *vdev,
int n)
hwaddr virtio_queue_get_avail_size(VirtIODevice *vdev, int n)
{
- return offsetof(VRingAvail, ring) +
- sizeof(uint16_t) * vdev->vq[n].vring.num;
+ int s;
+
+ if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
+ return sizeof(struct VRingPackedDescEvent);
+ } else {
+ s = virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;
+ return offsetof(VRingAvail, ring) +
+ sizeof(uint16_t) * vdev->vq[n].vring.num + s;
+ }
}
hwaddr virtio_queue_get_used_size(VirtIODevice *vdev, int n)
{
- return offsetof(VRingUsed, ring) +
- sizeof(VRingUsedElem) * vdev->vq[n].vring.num;
+ int s;
+
+ if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
+ return sizeof(struct VRingPackedDescEvent);
+ } else {
+ s = virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;
+ return offsetof(VRingUsed, ring) +
+ sizeof(VRingUsedElem) * vdev->vq[n].vring.num + s;
+ }
}
uint16_t virtio_queue_get_last_avail_idx(VirtIODevice *vdev, int n)
--
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 <=
- [Qemu-devel] [PATCH v1 05/16] virtio: add memory region init for packed ring, wexu, 2018/11/22
- [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