| Message ID | 9307b70e9876c4e9e3c4478524a32a23a3d5dd05.1499368180.git.alistair.francis@xilinx.com |
|---|---|
| State | New |
| Headers | show |
Looks good, but I noticed now that you may want to do that for qio_channel_create_socket_watch too. Paolo ----- Original Message ----- > From: "Alistair Francis" <alistair.francis@xilinx.com> > To: qemu-devel@nongnu.org, stefanha@redhat.com, famz@redhat.com > Cc: "alistair francis" <alistair.francis@xilinx.com>, alistair23@gmail.com, "edgar iglesias" > <edgar.iglesias@xilinx.com>, qemu-block@nongnu.org, philippe@mathieu-daude.net, pbonzini@redhat.com > Sent: Thursday, July 6, 2017 10:15:14 PM > Subject: [PATCH v2 1/1] util/aio-win32: Only select on what we are actually waiting for > > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > Changes in V2: > - Rebase on master > Changes since RFC: > - Include more bitmasks for the select call > > util/aio-win32.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/util/aio-win32.c b/util/aio-win32.c > index bca496a47a..d6d5e02f00 100644 > --- a/util/aio-win32.c > +++ b/util/aio-win32.c > @@ -71,6 +71,7 @@ void aio_set_fd_handler(AioContext *ctx, > } > } else { > HANDLE event; > + long bitmask = 0; > > if (node == NULL) { > /* Alloc and insert if it's not already there */ > @@ -95,10 +96,16 @@ void aio_set_fd_handler(AioContext *ctx, > node->io_write = io_write; > node->is_external = is_external; > > + if (io_read) { > + bitmask |= FD_READ | FD_ACCEPT | FD_CLOSE; > + } > + > + if (io_write) { > + bitmask |= FD_WRITE | FD_CONNECT; > + } > + > event = event_notifier_get_handle(&ctx->notifier); > - WSAEventSelect(node->pfd.fd, event, > - FD_READ | FD_ACCEPT | FD_CLOSE | > - FD_CONNECT | FD_WRITE | FD_OOB); > + WSAEventSelect(node->pfd.fd, event, bitmask); > } > > qemu_lockcnt_unlock(&ctx->list_lock); > -- > 2.11.0 > >
On Thu, Jul 06, 2017 at 01:15:14PM -0700, Alistair Francis wrote: > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > Changes in V2: > - Rebase on master > Changes since RFC: > - Include more bitmasks for the select call > > util/aio-win32.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
diff --git a/util/aio-win32.c b/util/aio-win32.c index bca496a47a..d6d5e02f00 100644 --- a/util/aio-win32.c +++ b/util/aio-win32.c @@ -71,6 +71,7 @@ void aio_set_fd_handler(AioContext *ctx, } } else { HANDLE event; + long bitmask = 0; if (node == NULL) { /* Alloc and insert if it's not already there */ @@ -95,10 +96,16 @@ void aio_set_fd_handler(AioContext *ctx, node->io_write = io_write; node->is_external = is_external; + if (io_read) { + bitmask |= FD_READ | FD_ACCEPT | FD_CLOSE; + } + + if (io_write) { + bitmask |= FD_WRITE | FD_CONNECT; + } + event = event_notifier_get_handle(&ctx->notifier); - WSAEventSelect(node->pfd.fd, event, - FD_READ | FD_ACCEPT | FD_CLOSE | - FD_CONNECT | FD_WRITE | FD_OOB); + WSAEventSelect(node->pfd.fd, event, bitmask); } qemu_lockcnt_unlock(&ctx->list_lock);