From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nd18P-0003kl-Cv for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:48:37 -0500 Received: from [199.232.76.173] (port=55449 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nd18P-0003kU-0F for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:48:37 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nd18N-0007rh-GW for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:48:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10413) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nd18N-0007rV-3X for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:48:35 -0500 Date: Thu, 4 Feb 2010 14:45:22 +0200 From: "Michael S. Tsirkin" Message-ID: <20100204124522.GG22559@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCH 06/15] virtio: add notifier support List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org Add binding API to set host/guest notifiers. Will be used by vhost. Signed-off-by: Michael S. Tsirkin --- hw/virtio.c | 13 ++++++++++--- hw/virtio.h | 5 ++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/virtio.c b/hw/virtio.c index 7c020a3..b9411e9 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -592,6 +592,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) { /* Always notify when queue is empty (when feature acknowledge) */ @@ -600,8 +606,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) @@ -714,8 +719,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 62e882b..2c298a8 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -18,6 +18,7 @@ #include "net.h" #include "qdev.h" #include "sysemu.h" +#include "notifier.h" /* from Linux's linux/virtio_config.h */ @@ -88,6 +89,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 (*guest_notifier)(void * opaque, int n, bool assigned); + int (*host_notifier)(void * opaque, int n, bool assigned); } VirtIOBindings; #define VIRTIO_PCI_QUEUE_MAX 64 @@ -180,5 +183,5 @@ 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); #endif -- 1.6.6.144.g5c3af