aboutsummaryrefslogtreecommitdiff
path: root/chardev
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2017-09-21 14:35:53 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2017-09-22 21:07:27 +0200
commit6bbb6c0644f76b58012bd7ed4279d44c59bb43ab (patch)
treefa9c455a00cb5f27d4baeaa17194819ee32925d4 /chardev
parent95eeeba669dca94492d708b2893f296839652c84 (diff)
downloadqemu-6bbb6c0644f76b58012bd7ed4279d44c59bb43ab.zip
qemu-6bbb6c0644f76b58012bd7ed4279d44c59bb43ab.tar.gz
qemu-6bbb6c0644f76b58012bd7ed4279d44c59bb43ab.tar.bz2
chardev: use per-dev context for io_add_watch_poll
It was only passed in by chr_update_read_handlers(). However when reconnect, we'll lose that context information. So if a chardev was running on another context (rather than the default context, the NULL pointer), it'll switch back to the default context if reconnection happens. But, it should really stick to the old context. Convert all the callers of io_add_watch_poll() to use the internally cached gcontext. Then the context should be able to survive even after reconnections. Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <1505975754-21555-4-git-send-email-peterx@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'chardev')
-rw-r--r--chardev/char-fd.c2
-rw-r--r--chardev/char-pty.c2
-rw-r--r--chardev/char-socket.c4
-rw-r--r--chardev/char-udp.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index 6a62a54..09fbb07 100644
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -94,7 +94,7 @@ static void fd_chr_update_read_handler(Chardev *chr,
chr->gsource = io_add_watch_poll(chr, s->ioc_in,
fd_chr_read_poll,
fd_chr_read, chr,
- context);
+ chr->gcontext);
}
}
diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index e5d20a0..d239c04 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -219,7 +219,7 @@ static void pty_chr_state(Chardev *chr, int connected)
chr->gsource = io_add_watch_poll(chr, s->ioc,
pty_chr_read_poll,
pty_chr_read,
- chr, NULL);
+ chr, chr->gcontext);
}
}
}
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 1ae730a..ee71cbe 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -516,7 +516,7 @@ static void tcp_chr_connect(void *opaque)
chr->gsource = io_add_watch_poll(chr, s->ioc,
tcp_chr_read_poll,
tcp_chr_read,
- chr, NULL);
+ chr, chr->gcontext);
}
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
@@ -535,7 +535,7 @@ static void tcp_chr_update_read_handler(Chardev *chr,
chr->gsource = io_add_watch_poll(chr, s->ioc,
tcp_chr_read_poll,
tcp_chr_read, chr,
- context);
+ chr->gcontext);
}
}
diff --git a/chardev/char-udp.c b/chardev/char-udp.c
index 4ee11d3..106dee1 100644
--- a/chardev/char-udp.c
+++ b/chardev/char-udp.c
@@ -110,7 +110,7 @@ static void udp_chr_update_read_handler(Chardev *chr,
chr->gsource = io_add_watch_poll(chr, s->ioc,
udp_chr_read_poll,
udp_chr_read, chr,
- context);
+ chr->gcontext);
}
}