[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/15] virtio: expand offset calculation for pack
From: |
wexu |
Subject: |
[Qemu-devel] [PATCH v2 03/15] virtio: expand offset calculation for packed ring |
Date: |
Wed, 16 Jan 2019 13:31:08 -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 827e745..112845c 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 v2 00/15] packed ring virtio-net backends support, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 01/15] virtio: introduce packed ring definitions, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 02/15] virtio: redefine structure & memory cache for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 03/15] virtio: expand offset calculation for packed ring,
wexu <=
- [Qemu-devel] [PATCH v2 05/15] virtio: init wrap counter for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 04/15] virtio: add memory region init for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 06/15] virtio: init and desc empty check for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 08/15] virtio: fill/flush/pop for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 10/15] virtio-net: fill head desc after done all in a chain, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 12/15] virtio: add vhost-net migration for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 07/15] virtio: get avail bytes check for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 13/15] virtio: packed ring feature bit for userspace backend, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 09/15] virtio: event suppression support for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 11/15] virtio: add userspace migration for packed ring, wexu, 2019/01/16