]> git.proxmox.com Git - mirror_qemu.git/commit
virtio: avoid using guest_notifier_mask in vhost-user mode
authorWei Huang <wei@redhat.com>
Thu, 15 Dec 2016 18:23:24 +0000 (12:23 -0600)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 15 Dec 2016 23:14:54 +0000 (01:14 +0200)
commit2858bc68701e282c404ed04d65d4f065e4b40e52
treec7d967dcd199fbba02732bbec5a396815afda206
parentd93ddfb1f8fb72a7c175a8cf1028c639f769d105
virtio: avoid using guest_notifier_mask in vhost-user mode

Because guest mask notifier cannot be used in vhost-user mode, a boolean
flag "use_guest_notifier_mask" was added in commit 5669655aafd to disable
the use of guest mask notifier under virtio-pci. However this flag wasn't
checked in other virtio devices, such as virtio-mmio. In our tests, it
caused assertion error under "vhost-user + virtio-mmio". This patch
addresses this problem by adding a check before guest_notifier_mask is
called.

Signed-off-by: Wei Huang <wei@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hw/s390x/virtio-ccw.c
hw/virtio/virtio-mmio.c