Skip to contentSkip to conversation

ui/input: Constify qemu_input_is_absolute()

PATCH In review Philippe Mathieu-Daudé 2 participants 4 messages Jun 11

lore
Share & tools
lore
#0 lore raw

cover ui/input: Constify qemu_input_is_absolute()

Notes while reviewing Marc-André's "ui: retire input-legacy.c" series ([email protected]).

Philippe Mathieu-Daudé (2):
tools/qemu-vnc: Have console_get_mouse/keyboard take const QemuConsole ui/input: Have qemu_input_is_absolute() take a const QemuConsole

 include/ui/input.h        | 2 +-
 tools/qemu-vnc/qemu-vnc.h | 4 ++--
 tools/qemu-vnc/display.c  | 4 ++--
 tools/qemu-vnc/input.c    | 2 +-
 ui/input.c                | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
2.53.0
#1 lore raw

PATCH 1/2 tools/qemu-vnc: Have console_get_mouse/keyboard take const QemuConsole

Both console_get_mouse() and console_get_keyboard() only access @con in read-only mode. Make that argument const.

---
 tools/qemu-vnc/qemu-vnc.h | 4 ++--
 tools/qemu-vnc/display.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
tools/qemu-vnc/qemu-vnc.h +2 -2
index 6e483e4b475..15e4ead80b7 100644
@@ -26,8 +26,8 @@ void input_setup(QemuDBusDisplay1Keyboard *kbd,
                  QemuDBusDisplay1Mouse *mouse);
 bool console_setup(GDBusConnection *bus, const char *bus_name,
                    const char *console_path);
-QemuDBusDisplay1Keyboard *console_get_keyboard(QemuConsole *con);
-QemuDBusDisplay1Mouse *console_get_mouse(QemuConsole *con);
+QemuDBusDisplay1Keyboard *console_get_keyboard(const QemuConsole *con);
+QemuDBusDisplay1Mouse *console_get_mouse(const QemuConsole *con);
 
 void audio_setup(GDBusObjectManager *manager);
 void clipboard_setup(GDBusObjectManager *manager, GDBusConnection *bus);
tools/qemu-vnc/display.c +2 -2
index 8fe9b6fc898..b485cbe3100 100644
@@ -433,7 +433,7 @@ bool console_setup(GDBusConnection *bus, const char *bus_name,
     return true;
 }
 
-QemuDBusDisplay1Keyboard *console_get_keyboard(QemuConsole *con)
+QemuDBusDisplay1Keyboard *console_get_keyboard(const QemuConsole *con)
 {
     ConsoleData *cd;
 
@@ -444,7 +444,7 @@ QemuDBusDisplay1Keyboard *console_get_keyboard(QemuConsole *con)
     return cd ? cd->keyboard_proxy : NULL;
 }
 
-QemuDBusDisplay1Mouse *console_get_mouse(QemuConsole *con)
+QemuDBusDisplay1Mouse *console_get_mouse(const QemuConsole *con)
 {
     ConsoleData *cd;
 
Signature · 1 line
2.53.0
#2 lore raw

PATCH 2/2 ui/input: Have qemu_input_is_absolute() take a const QemuConsole

In reply to Philippe Mathieu-Daudé

qemu_input_is_absolute() does not update the content of the QemuConsole structure. Make the argument const.

---
 include/ui/input.h     | 2 +-
 tools/qemu-vnc/input.c | 2 +-
 ui/input.c             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
include/ui/input.h +1 -1
index ea2d944a7ed..68571927761 100644
@@ -72,7 +72,7 @@ void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down);
 void qemu_input_update_buttons(QemuConsole *src, uint32_t *button_map,
                                uint32_t button_old, uint32_t button_new);
 
-bool qemu_input_is_absolute(QemuConsole *con);
+bool qemu_input_is_absolute(const QemuConsole *con);
 int qemu_input_scale_axis(int value,
                           int min_in, int max_in,
                           int min_out, int max_out);
tools/qemu-vnc/input.c +1 -1
index 6fb73b31248..9f21d20d26c 100644
@@ -175,7 +175,7 @@ void qemu_input_event_sync(void)
     }
 }
 
-bool qemu_input_is_absolute(QemuConsole *con)
+bool qemu_input_is_absolute(const QemuConsole *con)
 {
     QemuDBusDisplay1Mouse *mouse;
 
ui/input.c +2 -2
index c013cd9f7e0..6a80b42ef3e 100644
@@ -98,7 +98,7 @@ void qemu_input_handler_bind(QemuInputHandlerState *s,
 }
 
 static QemuInputHandlerState*
-qemu_input_find_handler(uint32_t mask, QemuConsole *con)
+qemu_input_find_handler(uint32_t mask, const QemuConsole *con)
 {
     QemuInputHandlerState *s;
 
@@ -436,7 +436,7 @@ void qemu_input_update_buttons(QemuConsole *src, uint32_t *button_map,
     }
 }
 
-bool qemu_input_is_absolute(QemuConsole *con)
+bool qemu_input_is_absolute(const QemuConsole *con)
 {
     QemuInputHandlerState *s;
 
Signature · 1 line
2.53.0
Reviewed-by on the v1 series
#3 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 8 lines · Philippe Mathieu-Daudé

Notes while reviewing Marc-André's "ui: retire input-legacy.c" series ([email protected]).

Philippe Mathieu-Daudé (2):
tools/qemu-vnc: Have console_get_mouse/keyboard take const QemuConsole ui/input: Have qemu_input_is_absolute() take a const QemuConsole

thanks

Quoted 11 lines
 include/ui/input.h        | 2 +-
 tools/qemu-vnc/qemu-vnc.h | 4 ++--
 tools/qemu-vnc/display.c  | 4 ++--
 tools/qemu-vnc/input.c    | 2 +-
 ui/input.c                | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

--
2.53.0