From patchwork Thu Feb 4 15:28:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 77036 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o14FVGQa017442 for ; Thu, 4 Feb 2010 15:31:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932804Ab0BDPbN (ORCPT ); Thu, 4 Feb 2010 10:31:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8919 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932221Ab0BDPbM (ORCPT ); Thu, 4 Feb 2010 10:31:12 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o14FVBch002758 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 4 Feb 2010 10:31:11 -0500 Received: from redhat.com (vpn2-9-138.ams2.redhat.com [10.36.9.138]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o14FV9cK005457 for ; Thu, 4 Feb 2010 10:31:10 -0500 Date: Thu, 4 Feb 2010 17:28:00 +0200 From: "Michael S. Tsirkin" To: kvm@vger.kernel.org Subject: [PATCH 07/20] virtio: add notifier support Message-ID: <20100204152800.GH8461@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 04 Feb 2010 15:31:16 +0000 (UTC) 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