From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUZIZ-0004BP-PL for qemu-devel@nongnu.org; Fri, 20 Jan 2017 08:32:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUZIY-0006SO-OH for qemu-devel@nongnu.org; Fri, 20 Jan 2017 08:32:11 -0500 From: Paolo Bonzini Date: Fri, 20 Jan 2017 14:31:30 +0100 Message-Id: <20170120133139.31080-27-pbonzini@redhat.com> In-Reply-To: <20170120133139.31080-1-pbonzini@redhat.com> References: <20170120133139.31080-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 26/35] char: fix ctrl-a b not working List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-stable@nongnu.org From: Marc-Andr=C3=A9 Lureau CharDriverState.be should be updated to point to the current associated backend. Fix the regression introduced in the "mux" chardev from commit a4afa548fc6dd9842ed86639b4d37d4d1c4ad480. https://bugs.launchpad.net/bugs/1654137 Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20170110110621.15287-1-marcandre.lureau@redhat.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- qemu-char.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 2c9940c..676944a 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -499,7 +499,7 @@ void qemu_chr_fe_printf(CharBackend *be, const char *= fmt, ...) =20 static void remove_fd_in_watch(CharDriverState *chr); static void mux_chr_set_handlers(CharDriverState *chr, GMainContext *con= text); -static void mux_set_focus(MuxDriver *d, int focus); +static void mux_set_focus(CharDriverState *chr, int focus); =20 static int null_chr_write(CharDriverState *chr, const uint8_t *buf, int = len) { @@ -666,7 +666,7 @@ static int mux_proc_byte(CharDriverState *chr, MuxDri= ver *d, int ch) case 'c': assert(d->mux_cnt > 0); /* handler registered with first fe = */ /* Switch to the next registered device */ - mux_set_focus(d, (d->focus + 1) % d->mux_cnt); + mux_set_focus(chr, (d->focus + 1) % d->mux_cnt); break; case 't': d->timestamps =3D !d->timestamps; @@ -826,8 +826,10 @@ static void mux_chr_set_handlers(CharDriverState *ch= r, GMainContext *context) context, true); } =20 -static void mux_set_focus(MuxDriver *d, int focus) +static void mux_set_focus(CharDriverState *chr, int focus) { + MuxDriver *d =3D chr->opaque; + assert(focus >=3D 0); assert(focus < d->mux_cnt); =20 @@ -836,6 +838,7 @@ static void mux_set_focus(MuxDriver *d, int focus) } =20 d->focus =3D focus; + chr->be =3D d->backends[focus]; mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN); } =20 @@ -935,7 +938,9 @@ void qemu_chr_fe_deinit(CharBackend *b) =20 if (b->chr) { qemu_chr_fe_set_handlers(b, NULL, NULL, NULL, NULL, NULL, true); - b->chr->be =3D NULL; + if (b->chr->be =3D=3D b) { + b->chr->be =3D NULL; + } if (b->chr->is_mux) { MuxDriver *d =3D b->chr->opaque; d->backends[b->tag] =3D NULL; @@ -999,7 +1004,7 @@ void qemu_chr_fe_take_focus(CharBackend *b) } =20 if (b->chr->is_mux) { - mux_set_focus(b->chr->opaque, b->tag); + mux_set_focus(b->chr, b->tag); } } =20 --=20 2.9.3