From nobody Tue Dec 16 12:35:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673291079; cv=none; d=zohomail.com; s=zohoarc; b=lF+KtGhbdn/L7X33gqN8amKCwOP0WV96ZcK3D+DK84WVXv+LARz7Nm09yPdzIShGtlYm6f+LEIYm8py/Isy5PPXtRbv94T6tL5I+YxJ2rBf7rjTvMvRk+nbgB1CsXdCfrjSmbl3Qv6N4qnhsWV2D/eI5mrLY7vXgqDilC2XTALE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673291079; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gIbvA16meAt5BD6PeVn8Nm6nFOLlFS3dcrYUWfmlxQg=; b=XUBZ3+M/hTOl9Bq5dctn1uf9+0SzcYQGbSLWpsIvUQb3jzCws0l7iZBOidRcxbeqH9wgPvg6DfEEe2C0jNuCBTJzFwJysf5nfBLLjw4boN1loeIaG+2ArTYqs31Tq1IFb5z1HsYuK7XAX1Ilras0phHY0wz9c3t/h+Op+SnRHk8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673291079707791.0165935577262; Mon, 9 Jan 2023 11:04:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pExRR-0004H9-KZ; Mon, 09 Jan 2023 14:04:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pExQn-0003xL-Uz for qemu-devel@nongnu.org; Mon, 09 Jan 2023 14:03:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pExQk-0001Iy-6p for qemu-devel@nongnu.org; Mon, 09 Jan 2023 14:03:37 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-575-ZeKWBditMPWKXR-jnnUDOQ-1; Mon, 09 Jan 2023 14:03:26 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D0F9780234E; Mon, 9 Jan 2023 19:03:25 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.78]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A767E1121318; Mon, 9 Jan 2023 19:03:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C1A9321E59C1; Mon, 9 Jan 2023 20:03:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673291007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gIbvA16meAt5BD6PeVn8Nm6nFOLlFS3dcrYUWfmlxQg=; b=YLd7miryFJtddbSEW6dvSBNbj4w8h6y6gmMWRvkn3asNSLegDNKAWO/00iLtS1sUb9EeXT gZOEAWy4sCkOEo/8f+4QWMVs0QC1EsSz4WPH5v5O1L1tvOBhuOB1ubTUCbZ/U9rBW9TzOl BZiaYs3oFH9cyb9r3Tq6C5+6dqOTzbA= X-MC-Unique: ZeKWBditMPWKXR-jnnUDOQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, dgilbert@redhat.com, berrange@redhat.com, philmd@linaro.org Subject: [PATCH v4 17/17] ui: Simplify control flow in qemu_mouse_set() Date: Mon, 9 Jan 2023 20:03:21 +0100 Message-Id: <20230109190321.1056914-18-armbru@redhat.com> In-Reply-To: <20230109190321.1056914-1-armbru@redhat.com> References: <20230109190321.1056914-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673291080205100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster --- 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 =3D 0; =20 QTAILQ_FOREACH(s, &handlers, node) { - if (s->id !=3D index) { - continue; + if (s->id =3D=3D 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 =3D 1; - qemu_input_handler_activate(s); - break; } =20 - if (!found) { + if (!s) { error_setg(errp, "Mouse at index '%d' not found", index); return false; } =20 + 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; } --=20 2.39.0