From patchwork Thu Feb 4 15:29:19 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: 77049 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 o14FWXLb020705 for ; Thu, 4 Feb 2010 15:32:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932353Ab0BDPcb (ORCPT ); Thu, 4 Feb 2010 10:32:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21069 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932278Ab0BDPca (ORCPT ); Thu, 4 Feb 2010 10:32:30 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o14FWTRq002724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 4 Feb 2010 10:32:30 -0500 Received: from redhat.com (vpn2-9-138.ams2.redhat.com [10.36.9.138]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o14FWSv4005974 for ; Thu, 4 Feb 2010 10:32:29 -0500 Date: Thu, 4 Feb 2010 17:29:19 +0200 From: "Michael S. Tsirkin" To: kvm@vger.kernel.org Subject: [PATCH 20/20] virtio-pci: irqfd support Message-ID: <20100204152919.GU8461@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.16 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:32:33 +0000 (UTC) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 02859a7..f3ed939 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -406,6 +406,27 @@ static void virtio_pci_guest_notifier_read(void *opaque) } } +static int virtio_pci_mask_notifier(PCIDevice *dev, unsigned vector, + void *opaque, int masked) +{ + VirtQueue *vq = opaque; + EventNotifier *notifier = virtio_queue_guest_notifier(vq); + int r = kvm_set_irqfd(dev->msix_irq_entries[vector].gsi, + event_notifier_get_fd(notifier), + !masked); + if (r < 0) { + return (r == -ENOSYS) ? 0 : r; + } + if (masked) { + qemu_set_fd_handler(event_notifier_get_fd(notifier), + virtio_pci_guest_notifier_read, NULL, vq); + } else { + qemu_set_fd_handler(event_notifier_get_fd(notifier), + NULL, NULL, vq); + } + return 0; +} + static int virtio_pci_guest_notifier(void *opaque, int n, bool assign) { VirtIOPCIProxy *proxy = opaque; @@ -414,11 +435,15 @@ static int virtio_pci_guest_notifier(void *opaque, int n, bool assign) if (assign) { int r = event_notifier_init(notifier, 0); - if (r < 0) - return r; + if (r < 0) + return r; qemu_set_fd_handler(event_notifier_get_fd(notifier), virtio_pci_guest_notifier_read, NULL, vq); + msix_set_mask_notifier(&proxy->pci_dev, + virtio_queue_vector(proxy->vdev, n), vq); } else { + msix_set_mask_notifier(&proxy->pci_dev, + virtio_queue_vector(proxy->vdev, n), NULL); qemu_set_fd_handler(event_notifier_get_fd(notifier), NULL, NULL, vq); event_notifier_cleanup(notifier); @@ -503,6 +528,8 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev, proxy->pci_dev.config_write = virtio_write_config; + proxy->pci_dev.msix_mask_notifier = virtio_pci_mask_notifier; + size = VIRTIO_PCI_REGION_SIZE(&proxy->pci_dev) + vdev->config_len; if (size & (size-1)) size = 1 << qemu_fls(size);