mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui/console: remove chardev frontend connected test

Browse Source 
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.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20210916192239.18742-3-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Volker Rümelin 2021-09-16 21:22:38 +02:00 committed by Gerd Hoffmann
parent ec22251904
commit 014b00cc0a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/console.c
View File

@ -28,10 +28,11 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-ui.h" #include "qapi/qapi-commands-ui.h"
#include "qemu/fifo8.h" #include "qemu/fifo8.h"
#include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "chardev/char-fe.h" #include "chardev/char.h"
#include "trace.h" #include "trace.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "io/channel-file.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) void kbd_put_keysym_console(QemuConsole *s, int keysym)
{ {
uint8_t buf[16], *q; uint8_t buf[16], *q;
CharBackend *be;
int c; int c;
uint32_t num_free; uint32_t num_free;
@ -1170,12 +1170,9 @@ void kbd_put_keysym_console(QemuConsole *s, int keysym)
if (s->echo) { if (s->echo) {
vc_chr_write(s->chr, buf, q - buf); vc_chr_write(s->chr, buf, q - buf);
} }
be = s->chr->be;
if (be && be->chr_read) {
num_free = fifo8_num_free(&s->out_fifo); num_free = fifo8_num_free(&s->out_fifo);
fifo8_push_all(&s->out_fifo, buf, MIN(num_free, q - buf)); fifo8_push_all(&s->out_fifo, buf, MIN(num_free, q - buf));
kbd_send_chars(s); kbd_send_chars(s);
}
break; break;
} }
} }