On Thu, Nov 06, 2014 at 10:38:34AM +0900, SeokYeon Hwang wrote: > Please review this patch. > > Thanks.
Thanks for the patch! Sorry, this patch missed the devel freeze. Please resubmit after 2.2 is out. > > -----Original Message----- > > From: SeokYeon Hwang [mailto:syeon.hw...@samsung.com] > > Sent: Friday, October 31, 2014 5:04 PM > > To: qemu-devel@nongnu.org > > Cc: aneesh.ku...@linux.vnet.ibm.com; SeokYeon Hwang > > Subject: [PATCH] 9pfs: changed to use event_notifier instead of qemu_pipe > > > > Changed to use event_notifier instead of qemu_pipe. > > It is necessary for porting 9pfs to Windows and MacOS. > > > > Signed-off-by: SeokYeon Hwang <syeon.hw...@samsung.com> > > --- > > hw/9pfs/virtio-9p-coth.c | 29 +++++++---------------------- > > hw/9pfs/virtio-9p-coth.h | 4 ++-- > > 2 files changed, 9 insertions(+), 24 deletions(-) > > > > diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c index > > ae6cde8..8185c53 100644 > > --- a/hw/9pfs/virtio-9p-coth.c > > +++ b/hw/9pfs/virtio-9p-coth.c > > @@ -14,6 +14,7 @@ > > > > #include "fsdev/qemu-fsdev.h" > > #include "qemu/thread.h" > > +#include "qemu/event_notifier.h" > > #include "block/coroutine.h" > > #include "virtio-9p-coth.h" > > > > @@ -26,15 +27,11 @@ void co_run_in_worker_bh(void *opaque) > > g_thread_pool_push(v9fs_pool.pool, co, NULL); } > > > > -static void v9fs_qemu_process_req_done(void *arg) > > +static void v9fs_qemu_process_req_done(EventNotifier *e) > > { > > - char byte; > > - ssize_t len; > > Coroutine *co; > > > > - do { > > - len = read(v9fs_pool.rfd, &byte, sizeof(byte)); > > - } while (len == -1 && errno == EINTR); > > + event_notifier_test_and_clear(e); > > > > while ((co = g_async_queue_try_pop(v9fs_pool.completed)) != NULL) { > > qemu_coroutine_enter(co, NULL); @@ -43,22 +40,18 @@ static void > > v9fs_qemu_process_req_done(void *arg) > > > > static void v9fs_thread_routine(gpointer data, gpointer user_data) { > > - ssize_t len; > > - char byte = 0; > > Coroutine *co = data; > > > > qemu_coroutine_enter(co, NULL); > > > > g_async_queue_push(v9fs_pool.completed, co); > > - do { > > - len = write(v9fs_pool.wfd, &byte, sizeof(byte)); > > - } while (len == -1 && errno == EINTR); > > + > > + event_notifier_set(&v9fs_pool.e); > > } > > > > int v9fs_init_worker_threads(void) > > { > > int ret = 0; > > - int notifier_fds[2]; > > V9fsThPool *p = &v9fs_pool; > > sigset_t set, oldset; > > > > @@ -66,10 +59,6 @@ int v9fs_init_worker_threads(void) > > /* Leave signal handling to the iothread. */ > > pthread_sigmask(SIG_SETMASK, &set, &oldset); > > > > - if (qemu_pipe(notifier_fds) == -1) { > > - ret = -1; > > - goto err_out; > > - } > > p->pool = g_thread_pool_new(v9fs_thread_routine, p, -1, FALSE, NULL); > > if (!p->pool) { > > ret = -1; > > @@ -84,13 +73,9 @@ int v9fs_init_worker_threads(void) > > ret = -1; > > goto err_out; > > } > > - p->rfd = notifier_fds[0]; > > - p->wfd = notifier_fds[1]; > > - > > - fcntl(p->rfd, F_SETFL, O_NONBLOCK); > > - fcntl(p->wfd, F_SETFL, O_NONBLOCK); > > + event_notifier_init(&p->e, 0); > > > > - qemu_set_fd_handler(p->rfd, v9fs_qemu_process_req_done, NULL, NULL); > > + event_notifier_set_handler(&p->e, v9fs_qemu_process_req_done); > > err_out: > > pthread_sigmask(SIG_SETMASK, &oldset, NULL); > > return ret; > > diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h index > > 86d5ed4..4f51b25 100644 > > --- a/hw/9pfs/virtio-9p-coth.h > > +++ b/hw/9pfs/virtio-9p-coth.h > > @@ -21,8 +21,8 @@ > > #include <glib.h> > > > > typedef struct V9fsThPool { > > - int rfd; > > - int wfd; > > + EventNotifier e; > > + > > GThreadPool *pool; > > GAsyncQueue *completed; > > } V9fsThPool; > > -- > > 2.1.0
