From 4fcaf3e7b718b44d00ee4e2a3f6852a71e472abe Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 22 Aug 2012 21:55:03 +0200 Subject: [PATCH] Revert "win: unmask evtchn before checking if libvchan_wait is needed" This reverts commit f7ce10db8f76f752cf9d65b420de352e70bdb048. This should be fixed by doing 0-length reads in qrexec main loop (instead of real read of fired port number). --- vchan/io.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/vchan/io.c b/vchan/io.c index 17a3abe3..e735c86a 100644 --- a/vchan/io.c +++ b/vchan/io.c @@ -125,12 +125,6 @@ int libvchan_write(struct libvchan *ctrl, char *data, int size) { int avail, avail_contig; int real_idx; -#ifdef WINNT - // because of mask-on-fire and do_notify called previously, evtchn must be - // unmasked before libvchan_wait. Do it before checking if data is - // available to prevent race - libvchan_prepare_to_select(ctrl); -#endif while ((avail = libvchan_buffer_space(ctrl)) == 0) if (libvchan_wait(ctrl) < 0) return -1; @@ -156,12 +150,6 @@ int libvchan_read(struct libvchan *ctrl, char *data, int size) { int avail, avail_contig; int real_idx; -#ifdef WINNT - // because of mask-on-fire and do_notify called previously, evtchn must be - // unmasked before libvchan_wait. Do it before checking if data is - // available to prevent race - libvchan_prepare_to_select(ctrl); -#endif while ((avail = libvchan_data_ready(ctrl)) == 0) if (libvchan_wait(ctrl) < 0) return -1;