[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 18/18] ui: Simplify control flow in qemu_mouse_set()
From: |
Markus Armbruster |
Subject: |
[PATCH v3 18/18] ui: Simplify control flow in qemu_mouse_set() |
Date: |
Tue, 20 Dec 2022 10:06:45 +0100 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
ui/input.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/ui/input.c b/ui/input.c
index 99e52c938e..df2f54cb9a 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -595,26 +595,24 @@ MouseInfoList *qmp_query_mice(Error **errp)
void qemu_mouse_set(int index, Error **err)
{
QemuInputHandlerState *s;
- int found = 0;
QTAILQ_FOREACH(s, &handlers, node) {
- if (s->id != index) {
- continue;
+ if (s->id == index) {
+ break;
}
- if (!(s->handler->mask & (INPUT_EVENT_MASK_REL |
- INPUT_EVENT_MASK_ABS))) {
- error_report("Input device '%s' is not a mouse", s->handler->name);
- return;
- }
- found = 1;
- qemu_input_handler_activate(s);
- break;
}
- if (!found) {
+ if (!s) {
error_report("Mouse at index '%d' not found", index);
return;
}
+ if (!(s->handler->mask & (INPUT_EVENT_MASK_REL |
+ INPUT_EVENT_MASK_ABS))) {
+ error_report("Input device '%s' is not a mouse", s->handler->name);
+ return;
+ }
+
+ qemu_input_handler_activate(s);
qemu_input_check_mode_change();
}
--
2.38.1
- [PATCH v3 00/18] ui: Move and clean up monitor command code, Markus Armbruster, 2022/12/20
- [PATCH v3 02/18] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2022/12/20
- [PATCH v3 04/18] Revert "hmp: info spice: take out webdav", Markus Armbruster, 2022/12/20
- [PATCH v3 10/18] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c, Markus Armbruster, 2022/12/20
- [PATCH v3 09/18] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c, Markus Armbruster, 2022/12/20
- [PATCH v3 01/18] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2022/12/20
- [PATCH v3 13/18] ui: Improve "change vnc" error reporting, Markus Armbruster, 2022/12/20
- [PATCH v3 18/18] ui: Simplify control flow in qemu_mouse_set(),
Markus Armbruster <=
- [PATCH v3 07/18] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2022/12/20
- [PATCH v3 06/18] ui/spice: QXLInterface method set_mm_time() is now dead, drop, Markus Armbruster, 2022/12/20
- [PATCH v3 03/18] ui/spice: Require spice-protocol >= 0.14.0, Markus Armbruster, 2022/12/20
- [PATCH v3 14/18] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c, Markus Armbruster, 2022/12/20
- [PATCH v3 15/18] ui: Reduce nesting in hmp_change_vnc() slightly, Markus Armbruster, 2022/12/20
- [PATCH v3 12/18] ui: Move more HMP commands from monitor to ui/, Markus Armbruster, 2022/12/20