From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 21 Oct 2011 13:56:21 +0000 (+0200)
Subject: spice: fix file handle cleanup
X-Git-Tag: v1.0-rc0~36^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08cc67f32ebe9b7dc3e1410f0678f198c092c0e7;p=thirdparty%2Fqemu.git

spice: fix file handle cleanup

Setting both read and write handlers to NULL in qemu_set_fd_handler
is not enougth to make qemu purge the file handle from the list.
We must set opaque to NULL too.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/ui/spice-core.c b/ui/spice-core.c
index be52356e63a..6d3dab6960f 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -133,7 +133,7 @@ static SpiceWatch *watch_add(int fd, int event_mask, SpiceWatchFunc func, void *
 
 static void watch_remove(SpiceWatch *watch)
 {
-    watch_update_mask(watch, 0);
+    qemu_set_fd_handler(watch->fd, NULL, NULL, NULL);
     QTAILQ_REMOVE(&watches, watch, next);
     g_free(watch);
 }