The qemu_input_qcode_to_number 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 | 16 +++++++---------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index 7ac1d62747..b3827b6082 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -42,7 +42,6 @@ void qemu_input_event_send_key_number(QemuConsole *src, int
num, bool down);
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_number(QKeyCode qcode);
int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes);
int qemu_input_linux_to_qcode(unsigned int lnx);
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 566b8f2000..71c6a79e66 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -32,14 +32,6 @@ int qemu_input_linux_to_qcode(unsigned int lnx)
return qemu_input_map_linux2qcode[lnx];
}
-int qemu_input_qcode_to_number(QKeyCode qcode)
-{
- if (qcode >= qemu_input_map_qcode2qnum_len) {
- return 0;
- }
- return qemu_input_map_qcode2qnum[qcode];
-}
-
int qemu_input_key_number_to_qcode(unsigned int nr)
{
if (nr >= qemu_input_map_qnum2qcode_len) {
@@ -51,9 +43,15 @@ int qemu_input_key_number_to_qcode(unsigned int nr)
int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down,
int *codes)
{
- int keycode = qemu_input_qcode_to_number(qcode);
+ int keycode;
int count = 0;
+ if (qcode >= qemu_input_map_qcode2qnum_len) {
+ keycode = 0;
+ } else {
+ keycode = qemu_input_map_qcode2qnum[qcode];
+ }
+
if (qcode == Q_KEY_CODE_PAUSE) {
/* specific case */
int v = down ? 0 : 0x80;
--
2.13.3
