qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Amit Shah <amit.shah@redhat.com>
To: qemu list <qemu-devel@nongnu.org>
Cc: qemu-stable@nongnu.org, Hans de Goede <hdegoede@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Anthony Liguori <anthony@codemonkey.ws>,
	Amit Shah <amit.shah@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 2/9] char: introduce tcp_chr_detach()
Date: Wed, 28 Aug 2013 10:40:44 +0530	[thread overview]
Message-ID: <f1a7d37fcd2b6fb21d4f536628aad0cd67521ff5.1377666450.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1377666450.git.amit.shah@redhat.com>
In-Reply-To: <cover.1377666450.git.amit.shah@redhat.com>

Remove any registered callbacks if a frontend is detached.

CC: <qemu-stable@nongnu.org>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 qemu-char.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/qemu-char.c b/qemu-char.c
index f27fdb6..e235334 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2321,6 +2321,16 @@ typedef struct {
     int msgfd;
 } TCPCharDriver;
 
+static void tcp_chr_detach(CharDriverState *chr)
+{
+    TCPCharDriver *s = chr->opaque;
+
+    if (s->tag) {
+        io_remove_watch_poll(s->tag);
+        s->tag = 0;
+    }
+}
+
 static gboolean tcp_chr_accept(GIOChannel *chan, GIOCondition cond, void *opaque);
 
 static int tcp_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
@@ -2689,6 +2699,7 @@ static CharDriverState *qemu_chr_open_socket_fd(int fd, bool do_nodelay,
     chr->opaque = s;
     chr->chr_write = tcp_chr_write;
     chr->chr_close = tcp_chr_close;
+    chr->chr_detach = tcp_chr_detach;
     chr->get_msgfd = tcp_get_msgfd;
     chr->chr_add_client = tcp_chr_add_client;
     chr->chr_add_watch = tcp_chr_add_watch;
-- 
1.8.3.1

  parent reply	other threads:[~2013-08-28  5:11 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-28  5:10 [Qemu-devel] [PATCH 0/9] char: fix segfault on chardev detach Amit Shah
2013-08-28  5:10 ` [Qemu-devel] [PATCH 1/9] char: remove watch callback on chardev detach from frontend Amit Shah
2013-08-28  5:10 ` Amit Shah [this message]
2013-08-28  7:09   ` [Qemu-devel] [PATCH 2/9] char: introduce tcp_chr_detach() Gerd Hoffmann
2013-08-28  8:10     ` Amit Shah
2013-08-28 11:38       ` Gerd Hoffmann
2013-08-28  5:10 ` [Qemu-devel] [PATCH 3/9] char: introduce fd_chr_detach() Amit Shah
2013-08-28  5:10 ` [Qemu-devel] [PATCH 4/9] char: introduce pty_chr_detach() Amit Shah
2013-08-28  5:10 ` [Qemu-devel] [PATCH 5/9] char: introduce udp_chr_detach() Amit Shah
2013-08-28  5:10 ` [Qemu-devel] [PATCH 6/9] char: use the new fd_chr_detach to dedup code Amit Shah
2013-08-28  5:10 ` [Qemu-devel] [PATCH 7/9] char: use the new pty_chr_detach " Amit Shah
2013-08-28  5:10 ` [Qemu-devel] [PATCH 8/9] char: use the new udp_chr_detach " Amit Shah
2013-08-28  5:10 ` [Qemu-devel] [PATCH 9/9] char: use the new tcp_chr_detach " Amit Shah

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=f1a7d37fcd2b6fb21d4f536628aad0cd67521ff5.1377666450.git.amit.shah@redhat.com \
    --to=amit.shah@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=hdegoede@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@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).