[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 17/17] ui: Simplify control flow in qemu_mouse_set()
From: |
Markus Armbruster |
Subject: |
[PATCH v4 17/17] ui: Simplify control flow in qemu_mouse_set() |
Date: |
Mon, 9 Jan 2023 20:03:21 +0100 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
ui/input.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/ui/input.c b/ui/input.c
index 7048810a57..f2d1e7a3a7 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -595,28 +595,26 @@ MouseInfoList *qmp_query_mice(Error **errp)
bool qemu_mouse_set(int index, Error **errp)
{
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_setg(errp, "Input device '%s' is not a mouse",
- s->handler->name);
- return false;
- }
- found = 1;
- qemu_input_handler_activate(s);
- break;
}
- if (!found) {
+ if (!s) {
error_setg(errp, "Mouse at index '%d' not found", index);
return false;
}
+ if (!(s->handler->mask & (INPUT_EVENT_MASK_REL |
+ INPUT_EVENT_MASK_ABS))) {
+ error_setg(errp, "Input device '%s' is not a mouse",
+ s->handler->name);
+ return false;
+ }
+
+ qemu_input_handler_activate(s);
qemu_input_check_mode_change();
return true;
}
--
2.39.0
- [PATCH v4 02/17] ui: Fix silent truncation of numeric keys in HMP sendkey, (continued)
- [PATCH v4 02/17] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2023/01/09
- [PATCH v4 05/17] ui/spice: Require spice-server >= 0.14.0, Markus Armbruster, 2023/01/09
- [PATCH v4 04/17] Revert "hmp: info spice: take out webdav", Markus Armbruster, 2023/01/09
- [PATCH v4 16/17] ui: Split hmp_mouse_set() and move the HMP part to ui/, Markus Armbruster, 2023/01/09
- [PATCH v4 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, drop, Markus Armbruster, 2023/01/09
- [PATCH v4 08/17] ui: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2023/01/09
- [PATCH v4 11/17] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c, Markus Armbruster, 2023/01/09
- [PATCH v4 17/17] ui: Simplify control flow in qemu_mouse_set(),
Markus Armbruster <=
- [PATCH v4 09/17] ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c, Markus Armbruster, 2023/01/09
- [PATCH v4 07/17] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2023/01/09
- [PATCH v4 10/17] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c, Markus Armbruster, 2023/01/09
- [PATCH v4 15/17] ui: Don't check for mode change after mouse_set error, Markus Armbruster, 2023/01/09
- [PATCH v4 01/17] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2023/01/09
- [PATCH v4 12/17] ui: Improve "change vnc" error reporting, Markus Armbruster, 2023/01/09