[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] char: use the new tcp_chr_detach to dedup code
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 9/9] char: use the new tcp_chr_detach to dedup code |
Date: |
Wed, 28 Aug 2013 10:40:51 +0530 |
Signed-off-by: Amit Shah <address@hidden>
---
qemu-char.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 2caab95..db256f8 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2514,10 +2514,7 @@ static gboolean tcp_chr_read(GIOChannel *chan,
GIOCondition cond, void *opaque)
if (s->listen_chan) {
s->listen_tag = g_io_add_watch(s->listen_chan, G_IO_IN,
tcp_chr_accept, chr);
}
- if (s->tag) {
- io_remove_watch_poll(s->tag);
- s->tag = 0;
- }
+ tcp_chr_detach(chr);
g_io_channel_unref(s->chan);
s->chan = NULL;
closesocket(s->fd);
@@ -2630,10 +2627,7 @@ static void tcp_chr_close(CharDriverState *chr)
{
TCPCharDriver *s = chr->opaque;
if (s->fd >= 0) {
- if (s->tag) {
- io_remove_watch_poll(s->tag);
- s->tag = 0;
- }
+ tcp_chr_detach(chr);
if (s->chan) {
g_io_channel_unref(s->chan);
}
--
1.8.3.1
- [Qemu-devel] [PATCH 2/9] char: introduce tcp_chr_detach(), (continued)
- [Qemu-devel] [PATCH 3/9] char: introduce fd_chr_detach(), Amit Shah, 2013/08/28
- [Qemu-devel] [PATCH 4/9] char: introduce pty_chr_detach(), Amit Shah, 2013/08/28
- [Qemu-devel] [PATCH 5/9] char: introduce udp_chr_detach(), Amit Shah, 2013/08/28
- [Qemu-devel] [PATCH 6/9] char: use the new fd_chr_detach to dedup code, Amit Shah, 2013/08/28
- [Qemu-devel] [PATCH 7/9] char: use the new pty_chr_detach to dedup code, Amit Shah, 2013/08/28
- [Qemu-devel] [PATCH 8/9] char: use the new udp_chr_detach to dedup code, Amit Shah, 2013/08/28
- [Qemu-devel] [PATCH 9/9] char: use the new tcp_chr_detach to dedup code,
Amit Shah <=