[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/8] xen-bus: allow AioContext to be specified for ea
From: |
Anthony PERARD |
Subject: |
[Qemu-devel] [PULL 3/8] xen-bus: allow AioContext to be specified for each event channel |
Date: |
Mon, 24 Jun 2019 16:32:52 +0100 |
From: Paul Durrant <address@hidden>
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 <address@hidden>
Reviewed-by: Anthony PERARD <address@hidden>
Message-Id: <address@hidden>
[Call aio_set_fd_handler() with is_external=true]
Signed-off-by: Anthony PERARD <address@hidden>
---
hw/block/dataplane/xen-block.c | 2 +-
hw/xen/xen-bus.c | 10 +++++++---
include/hw/xen/xen-bus.h | 1 +
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c
index 6da5c77fbb..aadca75644 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 43a90cae42..2210526490 100644
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -925,6 +925,7 @@ void xen_device_copy_grant_refs(XenDevice *xendev, bool
to_domain,
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");
diff --git a/include/hw/xen/xen-bus.h b/include/hw/xen/xen-bus.h
index 3315f0de20..8183b98c7d 100644
--- a/include/hw/xen/xen-bus.h
+++ b/include/hw/xen/xen-bus.h
@@ -122,6 +122,7 @@ void xen_device_copy_grant_refs(XenDevice *xendev, bool
to_domain,
typedef void (*XenEventHandler)(void *opaque);
XenEventChannel *xen_device_bind_event_channel(XenDevice *xendev,
+ AioContext *ctx,
unsigned int port,
XenEventHandler handler,
void *opaque, Error **errp);
--
Anthony PERARD
- [Qemu-devel] [PULL 0/8] xen queue 2019-06-24, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 3/8] xen-bus: allow AioContext to be specified for each event channel,
Anthony PERARD <=
- [Qemu-devel] [PULL 2/8] xen-bus: use a separate fd for each event channel, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 1/8] xen-block: support feature-large-sector-size, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 4/8] xen-bus / xen-block: add support for event channel polling, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 6/8] xen: Drop includes of xen/hvm/params.h, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 5/8] xen: Avoid VLA, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 7/8] Revert xen/io/ring.h of "Clean up a few header guard symbols", Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 8/8] xen: Import other xen/io/*.h, Anthony PERARD, 2019/06/24
- Re: [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24, no-reply, 2019/06/24
- Re: [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24, no-reply, 2019/06/24
- Re: [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24, no-reply, 2019/06/24