Patchwork iohandler: update qemu_fd_set_handler to work with null call back arg

login
register
mail settings
Submitter Aneesh Kumar K.V
Date Sept. 7, 2011, 10:45 a.m.
Message ID <1315392328-25317-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/113737/
State New
Headers show

Comments

Aneesh Kumar K.V - Sept. 7, 2011, 10:45 a.m.
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 <aneesh.kumar@linux.vnet.ibm.com>
---
 iohandler.c |   31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)

Patch

diff --git a/iohandler.c b/iohandler.c
index 5ef66fb..b803208 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -93,10 +93,6 @@  static gboolean fd_trampoline(GIOChannel *chan, GIOCondition cond, gpointer opaq
 {
     IOTrampoline *tramp = opaque;
 
-    if (tramp->opaque == NULL) {
-        return FALSE;
-    }
-
     if ((cond & G_IO_IN) && tramp->fd_read) {
         tramp->fd_read(tramp->opaque);
     }
@@ -113,6 +109,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 +118,21 @@  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;
-        }
+    tramp->fd_read = fd_read;
+    tramp->fd_write = fd_write;
+    tramp->opaque = opaque;
 
-        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->chan = g_io_channel_unix_new(fd);
+    tramp->tag = g_io_add_watch(tramp->chan, cond, fd_trampoline, tramp);
+
     return 0;
 }