qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 11/11] spice: fix file handle cleanup
Date: Tue, 25 Oct 2011 14:25:50 +0200	[thread overview]
Message-ID: <1319545550-24203-12-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1319545550-24203-1-git-send-email-kraxel@redhat.com>

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>
---
 ui/spice-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index be52356..6d3dab6 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);
 }
-- 
1.7.1

  parent reply	other threads:[~2011-10-25 12:57 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25 12:25 [Qemu-devel] [PULL] spice patch queue Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 01/11] migration: add status query functions Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 02/11] spice: turn client_migrate_info to async Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 03/11] spice: support the new migration interface (spice 0.8.3) Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 04/11] spice: Convert core to QEMU thread API Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 05/11] qxl: Convert " Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 06/11] qxl: Drop phread_yield on OOM Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 07/11] ui/spice-core: fix segfault in monitor Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 08/11] qxl: factor out properties Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 09/11] qxl: fix guest cursor tracking Gerd Hoffmann
2011-10-25 12:25 ` [Qemu-devel] [PATCH 10/11] qxl: reset update_surface Gerd Hoffmann
2011-10-25 12:25 ` Gerd Hoffmann [this message]
2011-10-31 16:51 ` [Qemu-devel] [PULL] spice patch queue Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1319545550-24203-12-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).