From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1HHr-00019c-Q3 for qemu-devel@nongnu.org; Wed, 07 Sep 2011 08:31:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1HHq-0002uL-Mp for qemu-devel@nongnu.org; Wed, 07 Sep 2011 08:31:27 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:42524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1HHq-0002tr-2w for qemu-devel@nongnu.org; Wed, 07 Sep 2011 08:31:26 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id p87CV7nY026581 for ; Wed, 7 Sep 2011 22:31:07 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p87CV20k1122528 for ; Wed, 7 Sep 2011 22:31:07 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p87CV27l017717 for ; Wed, 7 Sep 2011 22:31:02 +1000 From: "Aneesh Kumar K.V" Date: Wed, 7 Sep 2011 18:00:53 +0530 Message-Id: <1315398653-29945-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V2] iohandler: update qemu_fd_set_handler to work with null call back arg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, "Aneesh Kumar K.V" Many users of qemu_fd_set_handler including VirtFS use NULL call back arg. Update fd_trampoline and qemu_fd_set_handler to work with NULL call back arg Signed-off-by: Aneesh Kumar K.V --- Changes from V1: Add support for dropping event source iohandler.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/iohandler.c b/iohandler.c index 5ef66fb..783f3ac 100644 --- a/iohandler.c +++ b/iohandler.c @@ -93,9 +93,8 @@ static gboolean fd_trampoline(GIOChannel *chan, GIOCondition cond, gpointer opaq { IOTrampoline *tramp = opaque; - if (tramp->opaque == NULL) { + if (!tramp->fd_read && !tramp->fd_write) return FALSE; - } if ((cond & G_IO_IN) && tramp->fd_read) { tramp->fd_read(tramp->opaque); @@ -113,6 +112,7 @@ int qemu_set_fd_handler(int fd, IOHandler *fd_write, void *opaque) { + GIOCondition cond = 0; static IOTrampoline fd_trampolines[FD_SETSIZE]; IOTrampoline *tramp = &fd_trampolines[fd]; @@ -121,25 +121,20 @@ int qemu_set_fd_handler(int fd, g_source_remove(tramp->tag); } - if (opaque) { - GIOCondition cond = 0; - - tramp->fd_read = fd_read; - tramp->fd_write = fd_write; - tramp->opaque = opaque; - - if (fd_read) { - cond |= G_IO_IN | G_IO_ERR; - } - - if (fd_write) { - cond |= G_IO_OUT | G_IO_ERR; - } + if (fd_read) { + cond |= G_IO_IN | G_IO_ERR; + } - tramp->chan = g_io_channel_unix_new(fd); - tramp->tag = g_io_add_watch(tramp->chan, cond, fd_trampoline, tramp); + if (fd_write) { + cond |= G_IO_OUT | G_IO_ERR; } + tramp->fd_read = fd_read; + tramp->fd_write = fd_write; + tramp->opaque = opaque; + tramp->chan = g_io_channel_unix_new(fd); + tramp->tag = g_io_add_watch(tramp->chan, cond, fd_trampoline, tramp); + return 0; } -- 1.7.4.1