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

On Tue, Dec 20, 2022 at 10:06:45AM +0100, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  ui/input.c | 22 ++++++++++------------
>  1 file changed, 10 insertions(+), 12 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|