On Sun, Sep 12, 2021 at 4:53 PM Volker Rümelin <vr_q...@t-online.de> wrote:
> The test if the chardev frontend is connected in
> kbd_put_keysym_console() is redundant, because the call
> to qemu_chr_be_can_write() in kbd_send_chars() tests
> the connected condition again.
>
> Remove the redundant test whether the chardev frontend
> is connected.
>
> Signed-off-by: Volker Rümelin <vr_q...@t-online.de>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
> ui/console.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/ui/console.c b/ui/console.c
> index 7b276bfc6c..a06442ed86 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -28,10 +28,11 @@
> #include "qapi/error.h"
> #include "qapi/qapi-commands-ui.h"
> #include "qemu/fifo8.h"
> +#include "qemu/main-loop.h"
> #include "qemu/module.h"
> #include "qemu/option.h"
> #include "qemu/timer.h"
> -#include "chardev/char-fe.h"
> +#include "chardev/char.h"
> #include "trace.h"
> #include "exec/memory.h"
> #include "io/channel-file.h"
> @@ -1126,7 +1127,6 @@ static void kbd_send_chars(QemuConsole *s)
> void kbd_put_keysym_console(QemuConsole *s, int keysym)
> {
> uint8_t buf[16], *q;
> - CharBackend *be;
> int c;
> uint32_t free;
>
> @@ -1170,12 +1170,9 @@ void kbd_put_keysym_console(QemuConsole *s, int
> keysym)
> if (s->echo) {
> vc_chr_write(s->chr, buf, q - buf);
> }
> - be = s->chr->be;
> - if (be && be->chr_read) {
> - free = fifo8_num_free(&s->out_fifo);
> - fifo8_push_all(&s->out_fifo, buf, MIN(free, q - buf));
> - kbd_send_chars(s);
> - }
> + free = fifo8_num_free(&s->out_fifo);
> + fifo8_push_all(&s->out_fifo, buf, MIN(free, q - buf));
> + kbd_send_chars(s);
> break;
> }
> }
> --
> 2.31.1
>
>
>
--
Marc-André Lureau
