[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v2 06/12] virtio: allow virtio-1 queue layout
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH RFC v2 06/12] virtio: allow virtio-1 queue layout |
Date: |
Tue, 25 Nov 2014 14:24:17 +0100 |
For virtio-1 devices, we allow a more complex queue layout that doesn't
require descriptor table and rings on a physically-contigous memory area:
add virtio_queue_set_rings() to allow transports to set this up.
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/virtio/virtio.c | 16 ++++++++++++++++
include/hw/virtio/virtio.h | 2 ++
2 files changed, 18 insertions(+)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 4149f45..2c6bb91 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -96,6 +96,13 @@ static void virtqueue_init(VirtQueue *vq)
{
hwaddr pa = vq->pa;
+ if (pa == -1ULL) {
+ /*
+ * This is a virtio-1 style vq that has already been setup
+ * in virtio_queue_set.
+ */
+ return;
+ }
vq->vring.desc = pa;
vq->vring.avail = pa + vq->vring.num * sizeof(VRingDesc);
vq->vring.used = vring_align(vq->vring.avail +
@@ -719,6 +726,15 @@ hwaddr virtio_queue_get_addr(VirtIODevice *vdev, int n)
return vdev->vq[n].pa;
}
+void virtio_queue_set_rings(VirtIODevice *vdev, int n, hwaddr desc,
+ hwaddr avail, hwaddr used)
+{
+ vdev->vq[n].pa = -1ULL;
+ vdev->vq[n].vring.desc = desc;
+ vdev->vq[n].vring.avail = avail;
+ vdev->vq[n].vring.used = used;
+}
+
void virtio_queue_set_num(VirtIODevice *vdev, int n, int num)
{
/* Don't allow guest to flip queue between existent and
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 40e567c..f840320 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -227,6 +227,8 @@ void virtio_queue_set_addr(VirtIODevice *vdev, int n,
hwaddr addr);
hwaddr virtio_queue_get_addr(VirtIODevice *vdev, int n);
void virtio_queue_set_num(VirtIODevice *vdev, int n, int num);
int virtio_queue_get_num(VirtIODevice *vdev, int n);
+void virtio_queue_set_rings(VirtIODevice *vdev, int n, hwaddr desc,
+ hwaddr avail, hwaddr used);
void virtio_queue_set_align(VirtIODevice *vdev, int n, int align);
void virtio_queue_notify(VirtIODevice *vdev, int n);
uint16_t virtio_queue_vector(VirtIODevice *vdev, int n);
--
1.7.9.5
- [Qemu-devel] [PATCH RFC v2 00/12] qemu: towards virtio-1 host support, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 01/12] linux-headers/virtio_config: Update with VIRTIO_F_VERSION_1, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 02/12] virtio: cull virtio_bus_set_vdev_features, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 04/12] s390x/virtio-ccw: fix check for WRITE_FEAT, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 06/12] virtio: allow virtio-1 queue layout,
Cornelia Huck <=
- [Qemu-devel] [PATCH RFC v2 09/12] s390x/virtio-ccw: add virtio set-revision call, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 03/12] virtio: support more feature bits, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 05/12] virtio: introduce legacy virtio devices, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 11/12] virtio-net/virtio-blk: enable virtio 1.0, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 07/12] dataplane: allow virtio-1 devices, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 08/12] s390x/css: Add a callback for when subchannel gets disabled, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 12/12] s390x/virtio-ccw: enable virtio 1.0, Cornelia Huck, 2014/11/25
- [Qemu-devel] [PATCH RFC v2 10/12] s390x/virtio-ccw: support virtio-1 set_vq format, Cornelia Huck, 2014/11/25