Add binding API to set iofd/irqfd support. Will be used by vhost. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- hw/virtio.c | 13 ++++++++++--- hw/virtio.h | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/hw/virtio.c b/hw/virtio.c index 8e3c9ad..b9ec863 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -572,6 +572,12 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, return &vdev->vq[i]; } +void virtio_irq(VirtIODevice *vdev, VirtQueue *vq) +{ + vdev->isr |= 0x01; + virtio_notify_vector(vdev, vq->vector); +} + void virtio_notify(VirtIODevice *vdev, VirtQueue *vq) { /* Make sure used ring is updated before we check NO_INTERRUPT. */ @@ -582,8 +588,7 @@ void virtio_notify(VirtIODevice *vdev, VirtQueue *vq) (vq->inuse || vring_avail_idx(vq) != vq->last_avail_idx))) return; - vdev->isr |= 0x01; - virtio_notify_vector(vdev, vq->vector); + virtio_irq(vdev, vq); } void virtio_notify_config(VirtIODevice *vdev) @@ -696,8 +701,10 @@ VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, vdev->queue_sel = 0; vdev->config_vector = VIRTIO_NO_VECTOR; vdev->vq = qemu_mallocz(sizeof(VirtQueue) * VIRTIO_PCI_QUEUE_MAX); - for(i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) + for(i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { vdev->vq[i].vector = VIRTIO_NO_VECTOR; + vdev->vq[i].vdev = vdev; + } vdev->name = name; vdev->config_len = config_size; diff --git a/hw/virtio.h b/hw/virtio.h index ca840e1..193b3f9 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -88,6 +88,8 @@ typedef struct { int (*load_config)(void * opaque, QEMUFile *f); int (*load_queue)(void * opaque, int n, QEMUFile *f); unsigned (*get_features)(void * opaque); + int (*set_irqfd)(void * opaque, int n, int fd, bool assigned); + int (*set_queuefd)(void * opaque, int n, int fd, bool assigned); } VirtIOBindings; #define VIRTIO_PCI_QUEUE_MAX 16 @@ -196,6 +198,8 @@ struct VirtQueue int inuse; uint16_t vector; void (*handle_output)(VirtIODevice *vdev, VirtQueue *vq); + VirtIODevice *vdev; }; +void virtio_irq(VirtIODevice *vdev, VirtQueue *vq); #endif -- 1.6.6.rc1.43.gf55cc