The qemu_input_linux_to_qcode method is only used in one place and
no new code should require it, so inline it at the only caller.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
---
include/ui/input.h | 1 -
ui/input-keymap.c | 8 --------
ui/input-linux.c | 4 ++--
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index b3827b6082..92e54c25e2 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -43,7 +43,6 @@ void qemu_input_event_send_key_qcode(QemuConsole *src,
QKeyCode q, bool down);
void qemu_input_event_send_key_delay(uint32_t delay_ms);
int qemu_input_key_number_to_qcode(unsigned int nr);
int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes);
-int qemu_input_linux_to_qcode(unsigned int lnx);
InputEvent *qemu_input_event_new_btn(InputButton btn, bool down);
void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down);
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 71c6a79e66..bbd818ef97 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -24,14 +24,6 @@
#include "ui/input-keymap-xorgxquartz2qcode.c"
#include "ui/input-keymap-xorgxwin2qcode.c"
-int qemu_input_linux_to_qcode(unsigned int lnx)
-{
- if (lnx >= qemu_input_map_linux2qcode_len) {
- return 0;
- }
- return qemu_input_map_linux2qcode[lnx];
-}
-
int qemu_input_key_number_to_qcode(unsigned int nr)
{
if (nr >= qemu_input_map_qnum2qcode_len) {
diff --git a/ui/input-linux.c b/ui/input-linux.c
index 9720333b2c..f5eb589b1d 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -128,8 +128,8 @@ static void input_linux_handle_keyboard(InputLinux *il,
}
/* send event to guest when grab is active */
- if (il->grab_active) {
- int qcode = qemu_input_linux_to_qcode(event->code);
+ if (il->grab_active && event->code < qemu_input_map_linux2qcode_len) {
+ int qcode = qemu_input_map_linux2qcode[event->code];
qemu_input_event_send_key_qcode(NULL, qcode, event->value);
}
--
2.13.3
