[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/13] virtio: remove set_handler argument from set_
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/13] virtio: remove set_handler argument from set_host_notifier_internal |
Date: |
Mon, 10 Oct 2016 13:53:37 +0200 |
Make virtio_device_start_ioeventfd_impl use the same logic as
dataplane to set up the host notifier. This removes the need
for the set_handler argument in set_host_notifier_internal.
This is a first step towards using virtio_bus_set_host_notifier
as the sole entry point to set up ioeventfds. At least now
the functions have the same interface, but they still differ
in that virtio_bus_set_host_notifier sets ioeventfd_disabled.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio/virtio-bus.c | 12 +++---------
hw/virtio/virtio.c | 16 +++++++++++++---
include/hw/virtio/virtio-bus.h | 2 +-
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index ac8b24b..046bcc9 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -147,14 +147,8 @@ void virtio_bus_set_vdev_config(VirtioBusState *bus,
uint8_t *config)
}
}
-/*
- * This function handles both assigning the ioeventfd handler and
- * registering it with the kernel.
- * assign: register/deregister ioeventfd with the kernel
- * set_handler: use the generic ioeventfd handler
- */
int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus,
- int n, bool assign, bool set_handler)
+ int n, bool assign)
{
VirtIODevice *vdev = virtio_bus_get_device(bus);
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(bus);
@@ -169,7 +163,7 @@ int set_host_notifier_internal(DeviceState *proxy,
VirtioBusState *bus,
__func__, strerror(-r), r);
return r;
}
- virtio_queue_set_host_notifier_fd_handler(vq, true, set_handler);
+ virtio_queue_set_host_notifier_fd_handler(vq, true, false);
r = k->ioeventfd_assign(proxy, notifier, n, assign);
if (r < 0) {
error_report("%s: unable to assign ioeventfd: %d", __func__, r);
@@ -254,7 +248,7 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus, int
n, bool assign)
*/
virtio_bus_stop_ioeventfd(bus);
}
- return set_host_notifier_internal(proxy, bus, n, assign, false);
+ return set_host_notifier_internal(proxy, bus, n, assign);
}
static char *virtio_bus_get_dev_path(DeviceState *dev)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 93eec83..2817d42 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -2100,11 +2100,21 @@ static int
virtio_device_start_ioeventfd_impl(VirtIODevice *vdev)
if (!virtio_queue_get_num(vdev, n)) {
continue;
}
- r = set_host_notifier_internal(proxy, qbus, n, true, true);
+ r = set_host_notifier_internal(proxy, qbus, n, true);
if (r < 0) {
err = r;
goto assign_error;
}
+ virtio_queue_set_host_notifier_fd_handler(&vdev->vq[n], true, true);
+ }
+
+ for (n = 0; n < VIRTIO_QUEUE_MAX; n++) {
+ /* Kick right away to begin processing requests already in vring */
+ VirtQueue *vq = &vdev->vq[n];;
+ if (!vq->vring.num) {
+ continue;
+ }
+ event_notifier_set(&vq->host_notifier);
}
return 0;
@@ -2114,7 +2124,7 @@ assign_error:
continue;
}
- r = set_host_notifier_internal(proxy, qbus, n, false, false);
+ r = set_host_notifier_internal(proxy, qbus, n, false);
assert(r >= 0);
}
return err;
@@ -2138,7 +2148,7 @@ static void
virtio_device_stop_ioeventfd_impl(VirtIODevice *vdev)
if (!virtio_queue_get_num(vdev, n)) {
continue;
}
- r = set_host_notifier_internal(proxy, qbus, n, false, false);
+ r = set_host_notifier_internal(proxy, qbus, n, false);
assert(r >= 0);
}
}
diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h
index 521fac7..af6b5c4 100644
--- a/include/hw/virtio/virtio-bus.h
+++ b/include/hw/virtio/virtio-bus.h
@@ -143,6 +143,6 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus, int
n, bool assign);
/* This is temporary. It is only needed because virtio_bus_set_host_notifier
* sets ioeventfd_disabled but we will shortly get rid of it. */
int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus,
- int n, bool assign, bool set_handler);
+ int n, bool assign);
#endif /* VIRTIO_BUS_H */
--
2.7.4
- Re: [Qemu-devel] [PATCH 07/13] virtio-scsi: always use dataplane path if ioeventfd is active, (continued)
[Qemu-devel] [PATCH 10/13] virtio: remove ioeventfd_disabled altogether, Paolo Bonzini, 2016/10/10
[Qemu-devel] [PATCH 12/13] virtio: inline virtio_queue_set_host_notifier_fd_handler, Paolo Bonzini, 2016/10/10
[Qemu-devel] [PATCH 11/13] virtio: use virtio_bus_set_host_notifier to start/stop ioeventfd, Paolo Bonzini, 2016/10/10
[Qemu-devel] [PATCH 13/13] virtio: inline set_host_notifier_internal, Paolo Bonzini, 2016/10/10
[Qemu-devel] [PATCH 09/13] virtio: remove set_handler argument from set_host_notifier_internal,
Paolo Bonzini <=
Re: [Qemu-devel] [PATCH 00/12] virtio: cleanup ioeventfd start/stop, Cornelia Huck, 2016/10/18
Re: [Qemu-devel] [PATCH 00/12] virtio: cleanup ioeventfd start/stop, Cornelia Huck, 2016/10/19
- Re: [Qemu-devel] [PATCH 00/12] virtio: cleanup ioeventfd start/stop, Cornelia Huck, 2016/10/19
- Re: [Qemu-devel] [PATCH 00/12] virtio: cleanup ioeventfd start/stop, Paolo Bonzini, 2016/10/19
- Re: [Qemu-devel] [PATCH 00/12] virtio: cleanup ioeventfd start/stop, Cornelia Huck, 2016/10/20
- Re: [Qemu-devel] [PATCH 00/12] virtio: cleanup ioeventfd start/stop, Paolo Bonzini, 2016/10/20
- Re: [Qemu-devel] [PATCH 00/12] virtio: cleanup ioeventfd start/stop, Cornelia Huck, 2016/10/21