From nobody Sat Apr 11 17:08:52 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775744528; cv=none; d=zohomail.com; s=zohoarc; b=jYTesfPrysto1AWBWklBfNyxfIa3ClPlaHNbUo+7hh9LIMHIMCopJqXub/Pip1y7GB4kTsZBPp9kcYAf43gyOxcRYs0kVY0AAN6luNQp2wXG55pRyaa34Y3YHje9oKSIT8xom4vr9NHRUODkyUz8nFD7sfIKfZluCDKV2deu4F4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775744528; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OKbtz4f+5v/65iIJiJd5lWSZcH3qpMnB3cJS1OM7LJg=; b=ZlssoGPpX0GIhcx/+Ir3gMDn56jwZUdDQnjvt7K2hs3uCDWh/YXlGu6d5AJAi1CrzTZaK8buDuMvOQT7/wiep7TwMKM7Fes/DhQ4MTK2GGGum3I5K2HOEXPFD8Ai9nG6tdBclFQp8Sjktc7zXMQiEhgT8RAgAKkh2f5JBKhrwh8= 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 (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775744528485374.5044277999309; Thu, 9 Apr 2026 07:22:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAqGT-0002rs-M1; Thu, 09 Apr 2026 10:21:49 -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 1wAqGT-0002rk-3V for qemu-devel@nongnu.org; Thu, 09 Apr 2026 10:21:49 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAqGR-00035u-He for qemu-devel@nongnu.org; Thu, 09 Apr 2026 10:21:48 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4887ca8e529so6522135e9.0 for ; Thu, 09 Apr 2026 07:21:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488cd1999c6sm41405165e9.4.2026.04.09.07.21.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Apr 2026 07:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775744506; x=1776349306; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OKbtz4f+5v/65iIJiJd5lWSZcH3qpMnB3cJS1OM7LJg=; b=Vi26j2sgfUWqoXj6OkB+J7brChSTjPckNTcogdgnxlV2jrKqL/Dt84IgsU/ZCr6mqe d4Rbm5iPd/XHc9SqrCpSDaXxzaCKyspB6H5ijQhfu0B1+eyy99V3E1pfXevYqwfZyklk mCwQlCwNBE+Ty0MBS/020syiDIMcXwd9kGliS3C01eKZ4nvKNObKinLGbNxaAYuDatrS zPn6pI/DyVlThrlDtxrux+AANsPCXXqrLWRct5DehLkAJmk37WkxC9XP9qUqsUqKsuVs gXSS8Zf6GkKrPq6j49b+7ZP5t64Py3XkOS2P39F6XNuQZe8JSXsU3sEhEpYBKh85NYFI D1PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775744506; x=1776349306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=OKbtz4f+5v/65iIJiJd5lWSZcH3qpMnB3cJS1OM7LJg=; b=ah7Bpa4QZSaAj/0+BMvfmLTtTZOkXuVjeHSEu8WtVLufsrK8/Lr5n/YGLYQrGkLuZv p8040fl55kd8L0/zOsgNPGwCL9rwisCamxbdlIFLcrxEsGFuSMVRv1scuGSV3z11UcGn wQxFG6BGRuWkjX7qCFJ334l7QidFch31l+aVaO+7wBa0hpu869qlZV/We7dUa+/KCSsC cLrX35u4WYSh+4DQTfP+nNBr/1i+rVy/TCb9kG6/lLbWME7pci22VAVSqmlCiVBCRazv d+yP3VwsBmloHyrz0XBSbVfCrqNxgV0tbY1NZ73JFqECAqKrZ2JLtTb4+WrwLthKujwA dgOA== X-Gm-Message-State: AOJu0YxGFZke4E5gcauOUPfzonRzgN85ygzTeY2jBsU9j9dfi/5LGMqL khduEKiZ112MI5DCRwf9F/C1oybuwCtCzTd+M+42ZgBqsMoOxdp2l4c+ezKq060sCqcCbthhrGv Rs8RQd58= X-Gm-Gg: AeBDietTCv6Vw+a6hJBu3+KSqRtmZEiQVqFzJZG7gnwE9pesw/Q/RsOsLFBLhgmp4Yd on/zRGoAXB+ZEUshxsGzvfYcNgF7K2rFcjVlm8TPJ1HxoTDvu39GYRe34Gf68AMP0NFbOv5dVJt OtEtbJDIZRKK4KkMFEbGwxnwqZS/hxQY/Pfxlwo2dmJxHu430OaAxzeMDcmDucTZ3lrG99AHCz4 DTn+al2MbUAju4taH3ocf9Z25OOZ2Hj1MsgYy1SnZUjAsJ1QdiEVD0WwGSBqYiCmxw1zgLLHZY9 yKcPqGLRNLnxep7hB0Zn9vF+inA4CirATI28cTonNbprBhwna4rpGPDq0DKWbpzi9QOp1jmsRPP atGHq/p4lnhmKaxi4uo7D14P5uPBW3FGgvDxgTgY4DZUw58y01xsc+rOVHkoZfIW12A9iOccqgH GqgGzvuUuHyaull7o/dX1A3AW9ahww5INzMw7eCIUTE0eaLWW/afBeXFBQvgRRQjsna6SF4JOi X-Received: by 2002:a05:600c:c087:b0:485:3c2e:60d5 with SMTP id 5b1f17b1804b1-488cd50f45dmr35471385e9.2.1775744505650; Thu, 09 Apr 2026 07:21:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 1/4] ati-vga: Fix pitch and offset registers mask Date: Thu, 9 Apr 2026 16:21:33 +0200 Message-ID: <20260409142137.58349-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260409142137.58349-1-philmd@linaro.org> References: <20260409142137.58349-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development 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 @linaro.org) X-ZM-MESSAGEID: 1775744532332154100 From: BALATON Zoltan Remove the Radeon specific masks for offset and pitch registers. While the documentation is not clear about it I believe it is a copy&paste error from the combined DST_PITCH_OFFSET register that has less bits so more constrained than the individual registers which should not have this mask. Signed-off-by: BALATON Zoltan Message-ID: <20260404111318.8334E596A22@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 7bb57c44d95..88a5bbbf07a 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -820,18 +820,12 @@ static void ati_mm_write(void *opaque, hwaddr addr, ati_cursor_define(s); break; case DST_OFFSET: - if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { s->regs.dst_offset =3D data & 0xfffffff0; - } else { - s->regs.dst_offset =3D data & 0xfffffc00; - } break; case DST_PITCH: - if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { s->regs.dst_pitch =3D data & 0x3fff; + if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { s->regs.dst_tile =3D (data >> 16) & 1; - } else { - s->regs.dst_pitch =3D data & 0x3ff0; } break; case DST_TILE: @@ -941,18 +935,12 @@ static void ati_mm_write(void *opaque, hwaddr addr, s->regs.dst_height =3D (data >> 16) & 0x3fff; break; case SRC_OFFSET: - if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { s->regs.src_offset =3D data & 0xfffffff0; - } else { - s->regs.src_offset =3D data & 0xfffffc00; - } break; case SRC_PITCH: - if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { s->regs.src_pitch =3D data & 0x3fff; + if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { s->regs.src_tile =3D (data >> 16) & 1; - } else { - s->regs.src_pitch =3D data & 0x3ff0; } break; case DP_BRUSH_BKGD_CLR: --=20 2.53.0 From nobody Sat Apr 11 17:08:52 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775744539; cv=none; d=zohomail.com; s=zohoarc; b=bERgxzH0KYZ0XIYqxYgDo6egG6bYa5Grk5PTLjw8ZjkiV/5bH6AeU/iXcuWPt+nmgewueu1a3rTtfA7cmAhb5UV6dPqu05r6kzP9hmm0U22hHDZ3Uh8pCbHt/12lN++IuGXd1yepaSf8p+fYzEsDPMFby1p0Lqyn7sqRUm9vnuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775744539; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=v/Jd4YaaBvTfPvDC0v9XltfRQcsbFxXjKJ96oBPPl9w=; b=iR21X35yjP7sI9BSHCi2b/9HMWslZ+u3WAcgqmPHS5qTIKTXln2J18EjeGPBiDM89l4BJwy/zu/3RS3UztOveXcLKDf00tQYPC/GS+GLP7xtInWdqRBAVf1fxFmZ03xRJRmk/apFTstJOmrK80pd6oakwXtEl56GtsvLb3ADad4= 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 (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775744539577546.1715313662722; Thu, 9 Apr 2026 07:22:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAqGf-00033e-Al; Thu, 09 Apr 2026 10:22:01 -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 1wAqGa-0002vE-3N for qemu-devel@nongnu.org; Thu, 09 Apr 2026 10:21:56 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAqGY-00037Q-IX for qemu-devel@nongnu.org; Thu, 09 Apr 2026 10:21:55 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-43cfce3a195so601559f8f.2 for ; Thu, 09 Apr 2026 07:21:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e2c50a7sm67405047f8f.15.2026.04.09.07.21.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Apr 2026 07:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775744512; x=1776349312; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v/Jd4YaaBvTfPvDC0v9XltfRQcsbFxXjKJ96oBPPl9w=; b=N2OWpNNmiRROwGRB4JCiIDUdaOxbW8sOny3l7/HVaHplyUgKufQO2CuS7M45M3fsX7 rmqi9NbX1SnRnVRGP+ucWwSgHCuyw/5DNqlMMqNkELfQh7h9dKTvyu0uhYy2IWMgbvJg WhfOadY/W2Hxrj5xvFP7duitp5X2IsuK74foWSTvwnACjxmxMHT6zuAcfLsOyfdUb/3Q ki1pdPG+7DaOYgcoL5gS+Oib8apiwAU+QhbHlKqsfMC18glpdbJCcYpSgU2BaPdSEuIG VHUx/Uu3ykFClqctWn8dtQSSFfLv6yy0d2g6JpOO8oucreG4rG7trDNMEMILIxdPFX+s g+mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775744512; x=1776349312; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=v/Jd4YaaBvTfPvDC0v9XltfRQcsbFxXjKJ96oBPPl9w=; b=WpbqSek0VZPiqbfL88kpUPNGp4fJ1b6Kirs/qoRTY+TrSalESGO1UQ0ZAYIUmVhIQd zDtpB6rx02xiVfyDTCnQuAWXC6Elgr0npiQ/82l6WbdG7RW6C0Ggqh+Vi1gvdUygTwYz JjDxxYBuH6a4TAvVR+BQ3TRffUv6hKSqhN/Lv0bnWzi1VZP8EECWRo4zk7yxV917r08c 0qWCa/Y28kJyMKIMK4aacJ+619rMB9+jZri+dRiGKHpvMY633M80I4veak/apWAv3kMc 7yfEUu6cRrmBHzrK2X41lGpB7H9ljtOlZ2rR0o8J5pEEY7xlBdzknqTrjI2tdidfQGNU jCVw== X-Gm-Message-State: AOJu0YzdrS2wm/Tc8Rk2CTd+1wNnD6kso04KXOMHPJ3tb1I57D1mskIA FC96Phbx3EHkpGsEwEwiLoKJCg+TB1XRGRDN08AmmUGSL4Rq3htoZFdpyIGuW8t5qezHIfdb7pp H30Zlx+M= X-Gm-Gg: AeBDieuQvF2Fi3ydHhnmwvRzxuKUQgT2wuP5ki4fHWY7O07iyPBTVcpZtfywlnL63jN W7KFBMrW1DV15Vi0DRG3TXU7ZMkl4NbvzFug/b3Fjkog9NpP1TxlYKHONVQRWt6Ezyzq1+eqdzh xP8uqliExVvmTpkMDvZBX0/ERxNTO9OJJDo/cRy7wD8iUoFxrCnnLbuRwoX9R+N7z0eIH6GL63R WvvvEgq78CJAMxks11psIJRfy0Xvphc0Ah9P3ivAth7BEN4DxvqYViziGaTEit5elNqDLmTcVDw wYdYGm4BHdfa9iYMsGowKEBT8K71a9cpZsT1iJnL+fF++vuZPKViU9bILvfsAPY1l+jaE9sx5uI C5x9G9ssp83fuBOeHP9J7gdSgRpzDl5qlu5wHZSnpPZ5DzZdWK5RcTxr9WnHK54GelnR1didS/B XlmJ8WHFvZU46cCx8VJ0iaDoGDrFAsptR7jR1QkImWDL//fsUNWA6TrdQIhr9qOMtWx0f0Q9eSA YS39BoPkog= X-Received: by 2002:a05:6000:4305:b0:43b:50d6:4f04 with SMTP id ffacd0b85a97d-43d5a1a274bmr5276932f8f.38.1775744512535; Thu, 09 Apr 2026 07:21:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 2/4] hw/timer: ibex_timer: Update IRQs after writing CTRL Date: Thu, 9 Apr 2026 16:21:34 +0200 Message-ID: <20260409142137.58349-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260409142137.58349-1-philmd@linaro.org> References: <20260409142137.58349-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development 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 @linaro.org) X-ZM-MESSAGEID: 1775744541659158500 From: Alistair Francis When writing to rv_timer.CTRL after setting the compare values the timer doesn't fire as we don't update the interrupts. Ensure we update the interrupts after a write to the rv_timer.CTRL register. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/2796 Signed-off-by: Alistair Francis Reviewed-by: Chao Liu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel Henrique Barboza Reviewed-by: Nutty Liu Message-ID: <20260407043614.372871-5-alistair.francis@wdc.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/ibex_timer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c index 0f12531934d..571633803d0 100644 --- a/hw/timer/ibex_timer.c +++ b/hw/timer/ibex_timer.c @@ -193,6 +193,7 @@ static void ibex_timer_write(void *opaque, hwaddr addr, break; case R_CTRL: s->timer_ctrl =3D val; + ibex_timer_update_irqs(s); break; case R_CFG0: qemu_log_mask(LOG_UNIMP, "Changing prescale or step not supported"= ); --=20 2.53.0 From nobody Sat Apr 11 17:08:52 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775744574; cv=none; d=zohomail.com; s=zohoarc; b=fnk7r26hOWWAukNmqo4VdOmTF3JBYjrnUXOh10TNyUc9j5Ri9C4MNznwOlymCGxnWuTJFE9RE3PS8/usZhYOVHK+JsK/om5m3QIjaydNj0O9T/oAXXt6d/tHiy9b4S5hXRn/o/S5qVU3Ft923Jcrzy1JF7DtG7WDeYTQ46WIIWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775744574; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VjuOAzMxe2056w6Ss/yMMT0oZPZyJj/YY1kbGnOufgk=; b=LrTZ+mIzBbjPnuh5sq5OweXeehm7Vh7vFzPv6BDA445jWvQBmtaa2MskYICYYTc6spZn4ZegBiKqpM+pYU3f8oa1RZk9lURMOYveSwGG9eWcHpICxlNtbApqRD+XAbfXk9/TR2sBvApor5qV1lgE/7W0XL9Vx6R1yGdkZ3eCSwQ= 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 (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775744574154752.7957205234617; Thu, 9 Apr 2026 07:22:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAqGl-0003It-Tq; Thu, 09 Apr 2026 10:22:07 -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 1wAqGh-0003F9-A1 for qemu-devel@nongnu.org; Thu, 09 Apr 2026 10:22:03 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAqGf-00039N-Cu for qemu-devel@nongnu.org; Thu, 09 Apr 2026 10:22:02 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-43d02a71526so567439f8f.3 for ; Thu, 09 Apr 2026 07:22:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d5e969bbfsm5043612f8f.1.2026.04.09.07.21.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Apr 2026 07:21:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775744519; x=1776349319; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VjuOAzMxe2056w6Ss/yMMT0oZPZyJj/YY1kbGnOufgk=; b=BhlOCzMI3J7NKM1pDL6dlIcm6S6EQpxuUJNwIB0Ri0UgatrH7+jRb00b4AwG0LvNiI r5mLnKUPqTptntyj+D/nmakDUuRtvePWoE0rpbPe8dBTNFQmpRPeMpWJLb2Xj3+jbIyL ZV7LxNPbWIyUlMUdLxHQ/wwDnhV9iSw6LgaMfvT8W7fMcxbcoCEvCdk7UX1oP5UJwC2a OszcMKzgoC1x2g8fPaRp8b5/rR4HqMkq7ynnMDDCCoJ21jB1Gw0XzI4HWIc9PTN6S22u zetXq+3dSX0grak6QoqBjPpt3nKMXRbrBAZB8NCkKD9cKWI2hy5d7zT6lhZvSprM/aHt lxrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775744519; x=1776349319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VjuOAzMxe2056w6Ss/yMMT0oZPZyJj/YY1kbGnOufgk=; b=bTn4acBUuKF9850KrSefUKt0Mr2geK8Jv48S+17Y9xP2gJvCL4tPTjeSQfVsne7bZE 9uXNA6pvxWlcX0bDDpJyG/7VCKyqHfWwQs0H8CiSKkoIAmmO39mryI7YT0czlRxcs2RV xipv28f9VTFqdqr1uZXnb6Aeby6uv17ds7BJY3SE1Bhk3/xP6LA9zamkTOxhwCMsPo7f sfX6SRFa4doGv9z8zk438sNBXBbRNjU3ftg2wrSfgN0Lgq7uAzRs3x6zNXncfFxMNgvh EG1zM12ddp9taKlpxv4qrQ4TSZp0JxepXc6TeNBE8Ti2ZwegdDFW2NUFSjeF6yeunycO mx/w== X-Gm-Message-State: AOJu0YwLBk25aZAFqaMTOkOBygZ/np5gKd/zETzIgAMB/TYKuabSTaW9 X+HFl7q+Z0oSVOcptflCBCtKzVCv4wldMNEicU//wqV4yaQocOYnXv//k/BLLHVxMNm8BzxYVSL QyEnYpw8= X-Gm-Gg: AeBDiesKhNisGh7JIqN3u0Eh5gFUBx/k8l9B+/OW/Wiek3cS7wBdPuBh4ytq8b63Hwx x8UbSxTOB14akEPU0SaFg0UmGNSQ2tNDYA6uB/GjbUTdSER6hT4AyVAg11Ccr3WoXQrCXuRPDH7 FLFLJ6uaIScamaPuAzr76bfmaAQrhYkZ/R6uxLAKvCpUD/gvtewem27Y/tmO4HKGUKh12tS0Rj2 LJt/NSbk3+LXrk13iEe85TsrkDJEejznrykryNFBd1oI/dt55YUvHovhI6B9FthOhytQOOEk0AD CspZknd88UIc1FMwd2Fo0oIQaqs04WPF7mRcHj6kuhVHXJ5dyFATnliQhCvG83b3JI05qbDCVNk heie9JRsu5Gfqa562y0e6/TI0WfW1NRaDlXy8L4w6d6XhWxw/VrE9aO4JinFAkfHaEO01ej+eW2 kaAtxX0IGrLErCtAZxjqLKnoBH3VmJv22siPwH7rOJ0s8Uz8tqnH1jE9Ngx4J12LHlRqa1cKSm X-Received: by 2002:a05:6000:40ca:b0:43b:80a0:d92 with SMTP id ffacd0b85a97d-43d5a1b107dmr5243479f8f.45.1775744519260; Thu, 09 Apr 2026 07:21:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 3/4] ati-vga: Fix check for overflowing vram Date: Thu, 9 Apr 2026 16:21:35 +0200 Message-ID: <20260409142137.58349-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260409142137.58349-1-philmd@linaro.org> References: <20260409142137.58349-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development 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 @linaro.org) X-ZM-MESSAGEID: 1775744576501154100 From: BALATON Zoltan Take into account the bytes per pixels when checking for accessing beyond end of vram area. Signed-off-by: BALATON Zoltan Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260408104935.1A55A5969F6@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index f0f77cecc65..504d1c57085 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -146,6 +146,7 @@ static uint32_t make_filler(int bpp, uint32_t color) static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman) { QemuRect vis_src, vis_dst; + unsigned int x, y, i, j, bypp =3D ctx->bpp / 8; =20 if (!ctx->bpp) { qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); @@ -156,8 +157,9 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pi= xman) return false; } if (ctx->dst.x > 0x3fff || ctx->dst.y > 0x3fff || - ctx->dst_bits >=3D ctx->vram_end || ctx->dst_bits + ctx->dst.x + - (ctx->dst.y + ctx->dst.height) * ctx->dst_stride >=3D ctx->vram_en= d) { + ctx->dst_bits >=3D ctx->vram_end - bypp || + ctx->dst_bits + ctx->dst.x * bypp + (ctx->dst.y + ctx->dst.height)= * + ctx->dst_stride >=3D ctx->vram_end - bypp) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return false; } @@ -194,8 +196,9 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pi= xman) } if (!ctx->host_data_active && (vis_src.x > 0x3fff || vis_src.y > 0x3fff || - ctx->src_bits >=3D ctx->vram_end || ctx->src_bits + vis_src.x + - (vis_src.y + vis_dst.height) * ctx->src_stride >=3D ctx->vram_= end)) { + ctx->src_bits >=3D ctx->vram_end - bypp || + ctx->src_bits + vis_src.x * bypp + (vis_src.y + vis_dst.height= ) * + ctx->src_stride >=3D ctx->vram_end - bypp)) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return false; } @@ -240,7 +243,6 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pi= xman) fallback =3D true; } if (fallback) { - unsigned int y, i, j, bypp =3D ctx->bpp / 8; for (y =3D 0; y < vis_dst.height; y++) { i =3D vis_dst.x * bypp; j =3D vis_src.x * bypp; @@ -299,7 +301,6 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pi= xman) #endif { /* fallback when pixman failed or we don't want to call it */ - unsigned int x, y, i, bypp =3D ctx->bpp / 8; for (y =3D 0; y < vis_dst.height; y++) { i =3D vis_dst.x * bypp + (vis_dst.y + y) * ctx->dst_stride; for (x =3D 0; x < vis_dst.width; x++, i +=3D bypp) { --=20 2.53.0 From nobody Sat Apr 11 17:08:52 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775744559; cv=none; d=zohomail.com; s=zohoarc; b=jl81pOyKUwQdIJG32SEkiFSCkrnMf6t6HIWdoOvNHlKpQGOcftlRzxhTq5SO1SzSzzQMkWrGX2siw3mnX9m35hHdduR3oJAhq0XAr1Qz+jtSQ7gqswBOqT5zE1fWEIVxsk6/bzm1QT7n9p/laZGDu4c5ruzjjJbZVgzy2vcY+kY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775744559; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=L/+7Bj8ldsjqzb2+6rLdLpbTAiNwT8MkgbfOWGkcJ7k=; b=b5ibKd+aGeDugADjtZxqfkAyAQ5J8PZVomrdWo5yxLaLqh0ObcnpU7opjMUzbS4YIkLthgJLBNJ1upuAxcbAdqsM6ZN545+NBXvYkpLVv2Nq0J8m++yqOnd2HZK+tahpOt6nu2BgSICR1H/4qf0YcZK3eqjq9Fkat3J+jeB+KZs= 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 (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775744559901344.76312094193975; Thu, 9 Apr 2026 07:22:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAqGu-0003Nd-EY; Thu, 09 Apr 2026 10:22:18 -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 1wAqGn-0003Md-Fz for qemu-devel@nongnu.org; Thu, 09 Apr 2026 10:22:10 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAqGl-0003AS-TV for qemu-devel@nongnu.org; Thu, 09 Apr 2026 10:22:09 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488c21c636dso5748615e9.2 for ; Thu, 09 Apr 2026 07:22:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488cd2492e8sm77222315e9.15.2026.04.09.07.22.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Apr 2026 07:22:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775744526; x=1776349326; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L/+7Bj8ldsjqzb2+6rLdLpbTAiNwT8MkgbfOWGkcJ7k=; b=aV4HDEq9jxUAQyemc9PIftsbkieqGJkmoelmDA4bkcPR0O3FveP84cHnOQNY4DoUxj ARO52QBy3GsHB5ERR1hhG+Al4cOdK5bO48/ezphLOeCu6/Jux0OPcPC0sQFe1RRWCkMr 1+wcBU4joIw3vvri95HZUYkmP1E2fVU05EVQt65EABpxsapsgwYkJU6NMajpLF5eR/3j Fm+IWbYvxVZGliQpkgYUpX8EfCImCX7AD2sN5TBpnHqInaoH9crLZBcTweRhe8H5WWoQ vBArZhzPNdbicNgMh3W4IbWlNrb701GkNgqcVD19rCDnvgDH+dO2BLAI/VCDhlXfMj+d lWoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775744526; x=1776349326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=L/+7Bj8ldsjqzb2+6rLdLpbTAiNwT8MkgbfOWGkcJ7k=; b=HAnKL5hwR5UKEhufH0mOg1sZ9iLAcu0QLiP804r/mASxckKz2tBT7THtIYzM52fbW1 WnoaFNxjg8gBTRqkECjYn247V4E3Jb66rgCAKV1llIWpMfR3xYu9yTRPUc9GojtCyZp8 EsiuseGC2E1IrODYPoLlJQOtEihAtS3jK1tR+5uTYICXemDYl2GSbuAkOSFg/8rAppV0 fkYk6iUEjXz0gpBSl0evnX0W5+8FDKGectzCJd5RPz0pAr+lx1O+sHgw8N9izNbodxe4 PNQDUebUa6NWp1lRgGTs83VTVBD1hi/9eoRx+vypr2Q50Z11c2XWW8dpNtXtqExCMbjv YyyQ== X-Gm-Message-State: AOJu0Yyp1QCf2UmBOSXslIkxq9xnvyYk86+FnFo9xKcLEUfc6M+MHYq/ PFG82rOKJQfZ831aQ3W8BxEHOOFUKMvuD55nrPSCxTISb/RaD7mXGH82ZEjjbvhZFv2YALfQ4+w dOVQ2whM= X-Gm-Gg: AeBDieuXzpc6LYatezoJn4uelLBtz09H7yT2/XShdch3Rz+qIi2KH106QQVCkoX114a 4BFwjK69ViMciPD47xCknUR2a5V57Yl1Jw/k0kRtK7soTr+FN4AF9HLi1zTR5OvcdgZ+KrxIzJ6 WDOIABj33ipYVWVnt8YUGPQLeM81l1R/y4CNWK7LD6TeLmabNt+HZq/xVzdLXLn27Tx/OawPNYr 27DYaCjsGBSz5g/NDNTW8dwKa+iUJZ5aNfwiFb34XXhcSQS+AJi6WYbT0Ivvbg0nCXvDJUnTvM1 Ky2Z65Rj3HIKSu3xGscgrgqGD4QsB3+UVJ8vxhjVc5AOZ++rjuCULwQ/LF+vimA20EU5EJAnMTs 7OZP00cZCAqWYP78WOetJ04S9X77sUu/5U+4efLOkSsR4X9Sy4DW7naRBbqOwCW5QcZ1uL8sv2e 5Ne38402je1/slKpeyMXYc7/2TWspTbbfl6TJHYmxiON97CGchAhCxPRJ9EXFtv1GvuuYmaK4j X-Received: by 2002:a05:600c:6305:b0:480:690e:f14a with SMTP id 5b1f17b1804b1-4889978c561mr345190425e9.14.1775744525849; Thu, 09 Apr 2026 07:22:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 4/4] qemu-keymap: fix altgr modifier lookup for newer xkeyboard-config Date: Thu, 9 Apr 2026 16:21:36 +0200 Message-ID: <20260409142137.58349-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260409142137.58349-1-philmd@linaro.org> References: <20260409142137.58349-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development 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 @linaro.org) X-ZM-MESSAGEID: 1775744561944158500 From: Dietmar Maurer xkeyboard-config 2.37 removed the "AltGr" virtual modifier in favor of mapping upper groups directly to Mod5. Since then, xkb_keymap_mod_get_index(map, "AltGr") returns XKB_MOD_INVALID, so AltGr-based keysyms were never generated. See: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/com= mit/473f9bc32f9ba869829cc0d06a75cd1f2560aa60 Try "AltGr" first, and fall back to "Mod5" for compatibility with both old and new xkeyboard-config versions. Signed-off-by: Dietmar Maurer Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260408091459.4001711-1-dietmar@proxmox.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- qemu-keymap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qemu-keymap.c b/qemu-keymap.c index 1c081db2870..d4dccf456ef 100644 --- a/qemu-keymap.c +++ b/qemu-keymap.c @@ -230,6 +230,9 @@ int main(int argc, char *argv[]) shift =3D get_mod(map, "Shift"); ctrl =3D get_mod(map, "Control"); altgr =3D get_mod(map, "AltGr"); + if (!altgr) { + altgr =3D get_mod(map, "Mod5"); + } numlock =3D get_mod(map, "NumLock"); =20 state =3D xkb_state_new(map); --=20 2.53.0