On Tue, May 07, 2013 at 03:49:58PM +0300, Michael S. Tsirkin wrote:
> 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 <m...@redhat.com>
> Tested-by: Alexander Graf <ag...@suse.de>
> ---
>
> 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.
Not sure I made this clear.
If we can put it in 1.5 great, if not it must go into
stable branch.
> 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
