From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZiGG-0000J0-Qa for qemu-devel@nongnu.org; Tue, 07 May 2013 09:49:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZiG7-00049R-TH for qemu-devel@nongnu.org; Tue, 07 May 2013 09:48:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZiG7-00047s-LO for qemu-devel@nongnu.org; Tue, 07 May 2013 09:48:47 -0400 Date: Tue, 7 May 2013 15:49:58 +0300 From: "Michael S. Tsirkin" Message-ID: <20130507124958.GA21660@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCHv3 for-1.5] virtio-pci: fix level interrupts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Paolo Bonzini , Anthony Liguori , "Michael S. Tsirkin" , KONRAD Frederic mask notifiers are never called without msix, so devices with backend masking like vhost don't work. Call mask notifiers explicitly at startup/cleanup to make it work. Signed-off-by: Michael S. Tsirkin Tested-by: Alexander Graf --- changes from v2: fix bug spotted by Konrad changes from v1: rebased to master I'm guessing this missed 1.5. Added for-1.5 just in case - probably should go into 1.5.1. hw/virtio/virtio-pci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index d8708c1..195ee04 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -744,6 +744,7 @@ static int virtio_pci_set_guest_notifier(DeviceState *d, int n, bool assign, bool with_irqfd) { VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d); + VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(proxy->vdev); VirtQueue *vq = virtio_get_queue(proxy->vdev, n); EventNotifier *notifier = virtio_queue_get_guest_notifier(vq); @@ -758,6 +759,10 @@ static int virtio_pci_set_guest_notifier(DeviceState *d, int n, bool assign, event_notifier_cleanup(notifier); } + if (!msix_enabled(&proxy->pci_dev) && vdc->guest_notifier_mask) { + vdc->guest_notifier_mask(proxy->vdev, n, !assign); + } + return 0; } -- MST