diff options
| author | Paul Durrant <paul.durrant@citrix.com> | 2019-04-08 16:16:16 +0100 |
|---|---|---|
| committer | Anthony PERARD <anthony.perard@citrix.com> | 2019-06-24 10:42:29 +0100 |
| commit | 83361a8a1f932cfac8ae4a5b86e935ad6ab1c528 (patch) | |
| tree | 47c958b26d713af8cc5d439f28b6d6c063affeaf /hw | |
| parent | c0b336ea19a93801ee2333be525d0473d28a10f8 (diff) | |
| download | qemu-83361a8a1f932cfac8ae4a5b86e935ad6ab1c528.zip qemu-83361a8a1f932cfac8ae4a5b86e935ad6ab1c528.tar.gz qemu-83361a8a1f932cfac8ae4a5b86e935ad6ab1c528.tar.bz2 | |
xen-bus: allow AioContext to be specified for each event channel
This patch adds an AioContext parameter to xen_device_bind_event_channel()
and then uses aio_set_fd_handler() to set the callback rather than
qemu_set_fd_handler().
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Message-Id: <20190408151617.13025-3-paul.durrant@citrix.com>
[Call aio_set_fd_handler() with is_external=true]
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/dataplane/xen-block.c | 2 | ||||
| -rw-r--r-- | hw/xen/xen-bus.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index 6da5c77..aadca75 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -806,7 +806,7 @@ void xen_block_dataplane_start(XenBlockDataPlane *dataplane, } dataplane->event_channel = - xen_device_bind_event_channel(xendev, event_channel, + xen_device_bind_event_channel(xendev, dataplane->ctx, event_channel, xen_block_dataplane_event, dataplane, &local_err); if (local_err) { diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 43a90ca..2210526 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -925,6 +925,7 @@ done: struct XenEventChannel { QLIST_ENTRY(XenEventChannel) list; + AioContext *ctx; xenevtchn_handle *xeh; evtchn_port_t local_port; XenEventHandler handler; @@ -944,6 +945,7 @@ static void xen_device_event(void *opaque) } XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev, + AioContext *ctx, unsigned int port, XenEventHandler handler, void *opaque, Error **errp) @@ -969,8 +971,9 @@ XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev, channel->handler = handler; channel->opaque = opaque; - qemu_set_fd_handler(xenevtchn_fd(channel->xeh), xen_device_event, NULL, - channel); + channel->ctx = ctx; + aio_set_fd_handler(channel->ctx, xenevtchn_fd(channel->xeh), true, + xen_device_event, NULL, NULL, channel); QLIST_INSERT_HEAD(&xendev->event_channels, channel, list); @@ -1011,7 +1014,8 @@ void xen_device_unbind_event_channel(XenDevice *xendev, QLIST_REMOVE(channel, list); - qemu_set_fd_handler(xenevtchn_fd(channel->xeh), NULL, NULL, NULL); + aio_set_fd_handler(channel->ctx, xenevtchn_fd(channel->xeh), true, + NULL, NULL, NULL, NULL); if (xenevtchn_unbind(channel->xeh, channel->local_port) < 0) { error_setg_errno(errp, errno, "xenevtchn_unbind failed"); |