From patchwork Mon Jan 11 17:17:09 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: 42635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F3499B7BC3 for ; Tue, 12 Jan 2010 04:29:26 +1100 (EST) Received: from localhost ([127.0.0.1]:54556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUO3i-0005il-OD for incoming@patchwork.ozlabs.org; Mon, 11 Jan 2010 12:28:06 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUNw4-0000Io-4C for qemu-devel@nongnu.org; Mon, 11 Jan 2010 12:20:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUNw0-0000CM-GH for qemu-devel@nongnu.org; Mon, 11 Jan 2010 12:20:11 -0500 Received: from [199.232.76.173] (port=58013 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUNvz-0000CE-Ve for qemu-devel@nongnu.org; Mon, 11 Jan 2010 12:20:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6441) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUNvz-0007w5-HW for qemu-devel@nongnu.org; Mon, 11 Jan 2010 12:20:07 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0BHK5KT010078 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 11 Jan 2010 12:20:05 -0500 Received: from redhat.com (vpn2-11-60.ams2.redhat.com [10.36.11.60]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o0BHK3K7015494; Mon, 11 Jan 2010 12:20:03 -0500 Date: Mon, 11 Jan 2010 19:17:09 +0200 From: "Michael S. Tsirkin" To: Anthony Liguori , qemu-devel@nongnu.org Message-ID: <20100111171709.GD11936@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.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH-RFC 03/13] virtio: add iofd/irqfd support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add binding API to set iofd/irqfd support. Will be used by vhost. Signed-off-by: Michael S. Tsirkin --- 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