112 lines
3.2 KiB
Diff
112 lines
3.2 KiB
Diff
vhost needs physical addresses for ring and other queue fields,
|
|
so add APIs for these.
|
|
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
---
|
|
hw/virtio.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
|
|
hw/virtio.h | 10 +++++++++-
|
|
2 files changed, 56 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/virtio.c b/hw/virtio.c
|
|
index c2b80aa..b16ee1a 100644
|
|
--- a/hw/virtio.c
|
|
+++ b/hw/virtio.c
|
|
@@ -73,6 +73,9 @@ struct VirtQueue
|
|
int inuse;
|
|
uint16_t vector;
|
|
void (*handle_output)(VirtIODevice *vdev, VirtQueue *vq);
|
|
+ VirtIODevice *vdev;
|
|
+ EventNotifier guest_notifier;
|
|
+ EventNotifier host_notifier;
|
|
};
|
|
|
|
/* virt queue functions */
|
|
@@ -594,10 +597,10 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
|
|
return &vdev->vq[i];
|
|
}
|
|
|
|
-void virtio_irq(VirtIODevice *vdev, VirtQueue *vq)
|
|
+void virtio_irq(VirtQueue *vq)
|
|
{
|
|
- vdev->isr |= 0x01;
|
|
- virtio_notify_vector(vdev, vq->vector);
|
|
+ vq->vdev->isr |= 0x01;
|
|
+ virtio_notify_vector(vq->vdev, vq->vector);
|
|
}
|
|
|
|
void virtio_notify(VirtIODevice *vdev, VirtQueue *vq)
|
|
@@ -608,7 +611,8 @@ void virtio_notify(VirtIODevice *vdev, VirtQueue *vq)
|
|
(vq->inuse || vring_avail_idx(vq) != vq->last_avail_idx)))
|
|
return;
|
|
|
|
- virtio_irq(vdev, vq);
|
|
+ vdev->isr |= 0x01;
|
|
+ virtio_notify_vector(vdev, vq->vector);
|
|
}
|
|
|
|
void virtio_notify_config(VirtIODevice *vdev)
|
|
@@ -742,3 +746,42 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding,
|
|
vdev->binding = binding;
|
|
vdev->binding_opaque = opaque;
|
|
}
|
|
+
|
|
+target_phys_addr_t virtio_queue_get_desc(VirtIODevice *vdev, int n)
|
|
+{
|
|
+ return vdev->vq[n].vring.desc;
|
|
+}
|
|
+
|
|
+target_phys_addr_t virtio_queue_get_avail(VirtIODevice *vdev, int n)
|
|
+{
|
|
+ return vdev->vq[n].vring.avail;
|
|
+}
|
|
+
|
|
+target_phys_addr_t virtio_queue_get_used(VirtIODevice *vdev, int n)
|
|
+{
|
|
+ return vdev->vq[n].vring.used;
|
|
+}
|
|
+
|
|
+uint16_t virtio_queue_last_avail_idx(VirtIODevice *vdev, int n)
|
|
+{
|
|
+ return vdev->vq[n].last_avail_idx;
|
|
+}
|
|
+
|
|
+void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx)
|
|
+{
|
|
+ vdev->vq[n].last_avail_idx = idx;
|
|
+}
|
|
+
|
|
+VirtQueue *virtio_queue(VirtIODevice *vdev, int n)
|
|
+{
|
|
+ return vdev->vq + n;
|
|
+}
|
|
+
|
|
+EventNotifier *virtio_queue_guest_notifier(VirtQueue *vq)
|
|
+{
|
|
+ return &vq->guest_notifier;
|
|
+}
|
|
+EventNotifier *virtio_queue_host_notifier(VirtQueue *vq)
|
|
+{
|
|
+ return &vq->host_notifier;
|
|
+}
|
|
diff --git a/hw/virtio.h b/hw/virtio.h
|
|
index 10a0959..f140ca3 100644
|
|
--- a/hw/virtio.h
|
|
+++ b/hw/virtio.h
|
|
@@ -183,5 +183,13 @@ void virtio_net_exit(VirtIODevice *vdev);
|
|
DEFINE_PROP_BIT("indirect_desc", _state, _field, \
|
|
VIRTIO_RING_F_INDIRECT_DESC, true)
|
|
|
|
-void virtio_irq(VirtIODevice *vdev, VirtQueue *vq);
|
|
+target_phys_addr_t virtio_queue_get_desc(VirtIODevice *vdev, int n);
|
|
+target_phys_addr_t virtio_queue_get_avail(VirtIODevice *vdev, int n);
|
|
+target_phys_addr_t virtio_queue_get_used(VirtIODevice *vdev, int n);
|
|
+uint16_t virtio_queue_last_avail_idx(VirtIODevice *vdev, int n);
|
|
+void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx);
|
|
+VirtQueue *virtio_queue(VirtIODevice *vdev, int n);
|
|
+EventNotifier *virtio_queue_guest_notifier(VirtQueue *vq);
|
|
+EventNotifier *virtio_queue_host_notifier(VirtQueue *vq);
|
|
+void virtio_irq(VirtQueue *vq);
|
|
#endif
|
|
--
|
|
1.6.6.144.g5c3af
|