[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 43/45] vhost: use wfd on functions setting vring call fd
From: |
Michael S. Tsirkin |
Subject: |
[PULL 43/45] vhost: use wfd on functions setting vring call fd |
Date: |
Fri, 4 Mar 2022 08:42:46 -0500 |
From: Sergio Lopez <slp@redhat.com>
When ioeventfd is emulated using qemu_pipe(), only EventNotifier's wfd
can be used for writing.
Use the recently introduced event_notifier_get_wfd() function to
obtain the fd that our peer must use to signal the vring.
Signed-off-by: Sergio Lopez <slp@redhat.com>
Message-Id: <20220303115911.20962-3-slp@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/vhost.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 7b03efccec..b643f42ea4 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1287,7 +1287,7 @@ static int vhost_virtqueue_init(struct vhost_dev *dev,
return r;
}
- file.fd = event_notifier_get_fd(&vq->masked_notifier);
+ file.fd = event_notifier_get_wfd(&vq->masked_notifier);
r = dev->vhost_ops->vhost_set_vring_call(dev, &file);
if (r) {
VHOST_OPS_DEBUG(r, "vhost_set_vring_call failed");
@@ -1542,9 +1542,9 @@ void vhost_virtqueue_mask(struct vhost_dev *hdev,
VirtIODevice *vdev, int n,
if (mask) {
assert(vdev->use_guest_notifier_mask);
- file.fd = event_notifier_get_fd(&hdev->vqs[index].masked_notifier);
+ file.fd = event_notifier_get_wfd(&hdev->vqs[index].masked_notifier);
} else {
- file.fd = event_notifier_get_fd(virtio_queue_get_guest_notifier(vvq));
+ file.fd = event_notifier_get_wfd(virtio_queue_get_guest_notifier(vvq));
}
file.index = hdev->vhost_ops->vhost_get_vq_index(hdev, n);
--
MST
- [PULL 33/45] pci-bridge/xio3130_downstream: Fix error handling, (continued)
- [PULL 33/45] pci-bridge/xio3130_downstream: Fix error handling, Michael S. Tsirkin, 2022/03/04
- [PULL 34/45] headers: Add pvpanic.h, Michael S. Tsirkin, 2022/03/04
- [PULL 35/45] hw/misc/pvpanic: Use standard headers instead, Michael S. Tsirkin, 2022/03/04
- [PULL 36/45] pci: show id info when pci BDF conflict, Michael S. Tsirkin, 2022/03/04
- [PULL 37/45] pci: expose TYPE_XIO3130_DOWNSTREAM name, Michael S. Tsirkin, 2022/03/04
- [PULL 38/45] acpi: pcihp: pcie: set power on cap on parent slot, Michael S. Tsirkin, 2022/03/04
- [PULL 39/45] pc: add option to disable PS/2 mouse/keyboard, Michael S. Tsirkin, 2022/03/04
- [PULL 40/45] vhost-vsock: detach the virqueue element in case of error, Michael S. Tsirkin, 2022/03/04
- [PULL 41/45] x86: cleanup unused compat_apic_id_mode, Michael S. Tsirkin, 2022/03/04
- [PULL 42/45] event_notifier: add event_notifier_get_wfd(), Michael S. Tsirkin, 2022/03/04
- [PULL 43/45] vhost: use wfd on functions setting vring call fd,
Michael S. Tsirkin <=
- [PULL 44/45] configure, meson: allow enabling vhost-user on all POSIX systems, Michael S. Tsirkin, 2022/03/04
- [PULL 45/45] docs: vhost-user: add subsection for non-Linux platforms, Michael S. Tsirkin, 2022/03/04
- Re: [PULL 00/45] virtio,pc,pci: features, cleanups, fixes, Peter Maydell, 2022/03/04
- Re: [PULL 00/45] virtio,pc,pci: features, cleanups, fixes, Michael S. Tsirkin, 2022/03/06
- Re: [PULL 00/45] virtio,pc,pci: features, cleanups, fixes, Eric Auger, 2022/03/07