{"id":2226244,"url":"http://patchwork.ozlabs.org/api/patches/2226244/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422104042.3936506-36-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260422104042.3936506-36-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2026-04-22T10:40:36","name":"[PULL,35/40] ui/keymaps: introduce kbd_layout_free()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f02a9b3b60c341895005c51fdd2e52d0257587c6","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422104042.3936506-36-marcandre.lureau@redhat.com/mbox/","series":[{"id":500973,"url":"http://patchwork.ozlabs.org/api/series/500973/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500973","date":"2026-04-22T10:40:02","name":"[PULL,01/40] ui/input-linux: close evdev fd when qemu_set_blocking fails","version":1,"mbox":"http://patchwork.ozlabs.org/series/500973/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226244/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226244/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=HcKTnB7m;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0wqh1jDVz1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 20:45:52 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wFV4V-0002fv-5H; Wed, 22 Apr 2026 06:44:43 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <marcandre.lureau@redhat.com>)\n id 1wFV4J-0000q7-No\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 06:44:31 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <marcandre.lureau@redhat.com>)\n id 1wFV4G-0003J6-DE\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 06:44:29 -0400","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-55-BHgU2XTXMPWbFgiafmZ1uA-1; Wed,\n 22 Apr 2026 06:44:26 -0400","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 46DBE1800652; Wed, 22 Apr 2026 10:44:24 +0000 (UTC)","from localhost (unknown [10.44.22.21])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id D526B180047F; Wed, 22 Apr 2026 10:44:22 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776854667;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=r944Zh3o2C3dWrI8AujmdLr3ymk2rvx5/gP9TZ3t87g=;\n b=HcKTnB7mLNPQf8uPvdcCLHKx5n8sdJn6qLIXvrbI/osaYRdzB72fLt0uONMR8p3Jo5bagA\n rnQgPMl2s8H48oiOPGlXGW4a3T7+zvfxolYVHqn3hlLqZBLtXdr4JZ1rFsGTGeb40BquwQ\n mra5k/ThPbFfqE4VW1QEj5RQM9/nLyc=","X-MC-Unique":"BHgU2XTXMPWbFgiafmZ1uA-1","X-Mimecast-MFC-AGG-ID":"BHgU2XTXMPWbFgiafmZ1uA_1776854664","From":"marcandre.lureau@redhat.com","To":"qemu-devel@nongnu.org","Cc":"peter.maydell@linaro.org,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>","Subject":"[PULL 35/40] ui/keymaps: introduce kbd_layout_free()","Date":"Wed, 22 Apr 2026 14:40:36 +0400","Message-ID":"<20260422104042.3936506-36-marcandre.lureau@redhat.com>","In-Reply-To":"<20260422104042.3936506-1-marcandre.lureau@redhat.com>","References":"<20260422104042.3936506-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","Received-SPF":"pass client-ip=170.10.129.124;\n envelope-from=marcandre.lureau@redhat.com;\n 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,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n 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 <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Marc-André Lureau <marcandre.lureau@redhat.com>\n\nEnable callers to properly tear down keyboard layouts.\n\nReviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>\nReviewed-by: Daniel P. Berrangé <berrange@redhat.com>\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\n---\n ui/keymaps.h |  1 +\n ui/keymaps.c | 13 ++++++++++---\n 2 files changed, 11 insertions(+), 3 deletions(-)","diff":"diff --git a/ui/keymaps.h b/ui/keymaps.h\nindex 3d52c0882a1..e8917e56404 100644\n--- a/ui/keymaps.h\n+++ b/ui/keymaps.h\n@@ -54,6 +54,7 @@ typedef struct kbd_layout_t kbd_layout_t;\n \n kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,\n                                    const char *language, Error **errp);\n+void kbd_layout_free(kbd_layout_t *k);\n int keysym2scancode(kbd_layout_t *k, int keysym,\n                     QKbdState *kbd, bool down);\n int keycode_is_keypad(kbd_layout_t *k, int keycode);\ndiff --git a/ui/keymaps.c b/ui/keymaps.c\nindex 2359dbfe7e6..d1b3f43dc8a 100644\n--- a/ui/keymaps.c\n+++ b/ui/keymaps.c\n@@ -178,6 +178,14 @@ out:\n     return ret;\n }\n \n+void kbd_layout_free(kbd_layout_t *k)\n+{\n+    if (!k) {\n+        return;\n+    }\n+    g_hash_table_unref(k->hash);\n+    g_free(k);\n+}\n \n kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,\n                                    const char *language, Error **errp)\n@@ -185,10 +193,9 @@ kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,\n     kbd_layout_t *k;\n \n     k = g_new0(kbd_layout_t, 1);\n-    k->hash = g_hash_table_new(NULL, NULL);\n+    k->hash = g_hash_table_new_full(NULL, NULL, NULL, g_free);\n     if (parse_keyboard_layout(k, table, language, errp) < 0) {\n-        g_hash_table_unref(k->hash);\n-        g_free(k);\n+        kbd_layout_free(k);\n         return NULL;\n     }\n     return k;\n","prefixes":["PULL","35/40"]}