aboutsummaryrefslogtreecommitdiff
path: root/qemu-char.c
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-10-22 12:53:03 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2016-10-24 15:46:10 +0200
commit39ab61c6d0757ed95badc9315857effdb64e4aa0 (patch)
tree27e481ccb19976a11abc3ee314c52f12c35868c5 /qemu-char.c
parent72ac876248ca2d33b3e1170b2f86fb68daaacdc8 (diff)
downloadqemu-39ab61c6d0757ed95badc9315857effdb64e4aa0.zip
qemu-39ab61c6d0757ed95badc9315857effdb64e4aa0.tar.gz
qemu-39ab61c6d0757ed95badc9315857effdb64e4aa0.tar.bz2
char: remove explicit_fe_open, use a set_handlers argument
No need to keep explicit_fe_open around if it affects only a qemu_chr_fe_set_handlers(). Use an additional argument instead. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20161022095318.17775-24-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qemu-char.c')
-rw-r--r--qemu-char.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/qemu-char.c b/qemu-char.c
index af060ce..a1517a4 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -832,7 +832,7 @@ static void mux_chr_set_handlers(CharDriverState *chr, GMainContext *context)
mux_chr_read,
mux_chr_event,
chr,
- context);
+ context, true);
}
static void mux_set_focus(MuxDriver *d, int focus)
@@ -931,7 +931,7 @@ void qemu_chr_fe_deinit(CharBackend *b)
assert(b);
if (b->chr) {
- qemu_chr_fe_set_handlers(b, NULL, NULL, NULL, NULL, NULL);
+ qemu_chr_fe_set_handlers(b, NULL, NULL, NULL, NULL, NULL, true);
b->chr->avail_connections++;
b->chr->be = NULL;
if (b->chr->is_mux) {
@@ -947,7 +947,8 @@ void qemu_chr_fe_set_handlers(CharBackend *b,
IOReadHandler *fd_read,
IOEventHandler *fd_event,
void *opaque,
- GMainContext *context)
+ GMainContext *context,
+ bool set_open)
{
CharDriverState *s;
int fe_open;
@@ -971,7 +972,7 @@ void qemu_chr_fe_set_handlers(CharBackend *b,
s->chr_update_read_handler(s, context);
}
- if (!s->explicit_fe_open) {
+ if (set_open) {
qemu_chr_fe_set_open(b, fe_open);
}