mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
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>
This commit is contained in:
parent
72ac876248
commit
39ab61c6d0
44 changed files with 67 additions and 60 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue