From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9C7E9CD98E4 for ; Wed, 17 Jun 2026 15:24:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wZs7E-0005Df-Al; Wed, 17 Jun 2026 11:23:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZs7C-0005C2-Aj for qemu-devel@nongnu.org; Wed, 17 Jun 2026 11:23:42 -0400 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 1wZs7A-00043G-Na for qemu-devel@nongnu.org; Wed, 17 Jun 2026 11:23:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781709820; 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=UxZUNvwWAjxJnqiWTST9BHMgAOWqnx0QfSP91jc8058=; b=f0N37/FOz0WA6b+0c7ftrJwkpmFV6p767t2qcSiCEco1icnTkJMnp+hDw+V8AVsn1nxbvZ LgfdPrKi5J/aoY8ofZx6rBQx8sAKCCwWuJ87wPyPfwhqrUWBZRmmi5v48N3ESz87sZaGTt 65g2YQ4NVQHzhCTriXdEDVQ8WakXxG4= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-659-POlr2RC4NhuJXIHXdrZrRw-1; Wed, 17 Jun 2026 11:23:38 -0400 X-MC-Unique: POlr2RC4NhuJXIHXdrZrRw-1 X-Mimecast-MFC-AGG-ID: POlr2RC4NhuJXIHXdrZrRw_1781709817 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C53C51806C86 for ; Wed, 17 Jun 2026 15:23:37 +0000 (UTC) Received: from localhost (unknown [10.44.22.6]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 68F451800591; Wed, 17 Jun 2026 15:23:35 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 17 Jun 2026 19:22:59 +0400 Subject: [GIT PULL 02/27] ui/hmp: move index_from_key() where it is used MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260617-ui-input-v1-2-79e9aedc5899@redhat.com> References: <20260617-ui-input-v1-0-79e9aedc5899@redhat.com> In-Reply-To: <20260617-ui-input-v1-0-79e9aedc5899@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi X-Developer-Signature: v=1; a=openpgp-sha256; l=2281; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=wXfw72vTSr4KKaDWsW73dCO4+hZUkFWNWVCR09czORY=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqMrvotrtsnYO4BviTTdG8wlrlS7r2pee0mE62n Q0T9xjXqrOJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCajK76AAKCRDa6OEJdZac 5Y7ED/9Exi89hnLIkWOpx94Q0zQC4ruc5Mrbkfxp/glt8b+sDx8qY8jlerGX4FD9q2nchbfiBMx sC/f0fKnnrksjN96pmS/NDpX7GfpYewADkvTi/RzQAYwTx61+cws7/pYuqUgrs7wocWleYAQhb3 SUddboNZ5cg6QZzZ1q2yqkBFbHBlUJ+pQHO9tOGI54dPFiGYYDEeN6527yhBlEmqj3amdC581Vx hC1pEP++NGTdKR7s2OK1PrX+ss28veptMUc4YJugOZi8hfVT5L+uaQ+4HSZVL9aTqzuJSGGs0rg dw0Q52hhpd/KP3bYi7pCvzf/aXZiywVMP8eJZDA1joQOTdLs81c9D0joI47jVoYoZa3qWy9lAdW 6NmzT5SBnl2Uikzxu4CImG0xq/xulTnQiNLhoZ/VEVzpWsVal6An5rLFVZWMxVsj9qXNPDfyQlJ mTmIIRo9yxqXJEcUhEl6OM1nqefL2eHZr1U7uqE03ycGNxLdvqinQFHqVVCM4pyYbqyaCybu0X6 D2u4YkAcNgAZoi/nCf514DhUoBmKlQehbQ+T+zVXmtFlOTxELFH8DbFJlmp0h+RmOpDnpTOmEcj cx91qgO50lEYGbv5SOyB6srIzhrLy/n/maJa0w4hiCI89KdSlFfCkE42PDW/NkK82FfhAf81h9s ajSrKriGwaupXpw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Marc-André Lureau --- include/ui/console.h | 3 --- ui/input-legacy.c | 15 --------------- ui/ui-hmp-cmds.c | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index a31c5a4995c..3cb78989cd2 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -450,9 +450,6 @@ bool vnc_display_reload_certs(const char *id, Error **errp); bool vnc_display_update(DisplayUpdateOptionsVNC *arg, Error **errp); void vnc_cleanup(void); -/* input.c */ -int index_from_key(const char *key, size_t key_length); - #ifdef CONFIG_LINUX /* udmabuf.c */ int udmabuf_fd(void); diff --git a/ui/input-legacy.c b/ui/input-legacy.c index 193c9ae2ef9..71b17a3cfc7 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -56,21 +56,6 @@ struct QEMUPutLEDEntry { static QTAILQ_HEAD(, QEMUPutLEDEntry) led_handlers = QTAILQ_HEAD_INITIALIZER(led_handlers); -int index_from_key(const char *key, size_t key_length) -{ - int i; - - for (i = 0; i < Q_KEY_CODE__MAX; i++) { - if (!strncmp(key, QKeyCode_str(i), key_length) && - !QKeyCode_str(i)[key_length]) { - break; - } - } - - /* Return Q_KEY_CODE__MAX if the key is invalid */ - return i; -} - void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time, Error **errp) { diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c index 1e9bc77bd80..76f5181de43 100644 --- a/ui/ui-hmp-cmds.c +++ b/ui/ui-hmp-cmds.c @@ -350,6 +350,21 @@ void hmp_change_vnc(Monitor *mon, const char *device, const char *target, } #endif +static int index_from_key(const char *key, size_t key_length) +{ + int i; + + for (i = 0; i < Q_KEY_CODE__MAX; i++) { + if (!strncmp(key, QKeyCode_str(i), key_length) && + !QKeyCode_str(i)[key_length]) { + break; + } + } + + /* Return Q_KEY_CODE__MAX if the key is invalid */ + return i; +} + void hmp_sendkey(Monitor *mon, const QDict *qdict) { const char *keys = qdict_get_str(qdict, "keys"); -- 2.54.0