From nobody Mon May 25 20:33:14 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=1778257301; cv=none; d=zohomail.com; s=zohoarc; b=e4ckz1ZKh5gk7B+aJVMQZzwk8OgR1NC1Xznk6Q8Vfv2ru5GGpQwenyj87Jdrzlw9cFPtijSYrxSW3TMzPTj+VYoFBtFcFk0b8vGxq07xzapgpNzw+ZpnPvVmeJwU3iBFARNT324nIiPerI3J3tHpke2lVidg9cvuAw/UDBG6Duc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778257301; h=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=tHeQ0RvfaPoCSBPza9VvcReWRUsEKtq1mtgPNpsP4iY=; b=V/PwPQA/ieaQeb32DEETLblR2j2NlmOSlhlhTfIj2zXpj/m6JjWHnrdFjM/kwaUm30qpJ5Wf/X0t5J9yA0nPRmYLk+vtH7302AMTNwXGCLYZZuJxN8TXsqaOqHY7oc+iALdjOoNFYsUBhGyaSpZ3JuV3/JPX3r/+EA5dBDB9X4U= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778257301862217.07467987006714; Fri, 8 May 2026 09:21:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLNw6-0001LK-9I; Fri, 08 May 2026 12:20:22 -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 1wLNw4-0001Kh-Dj for qemu-devel@nongnu.org; Fri, 08 May 2026 12:20:20 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wLNw2-0000wr-JT for qemu-devel@nongnu.org; Fri, 08 May 2026 12:20:20 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-44b330c5cc6so1583975f8f.1 for ; Fri, 08 May 2026 09:20:18 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4548ec6aea4sm6226998f8f.10.2026.05.08.09.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 09:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778257217; x=1778862017; 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=tHeQ0RvfaPoCSBPza9VvcReWRUsEKtq1mtgPNpsP4iY=; b=NYw2bYXcgJY91FHw2170YC3WXihz6tI/AhHejIGCchsojN2K1KhOYoLKpdKSONmlc6 rDRmOS8WhMgln8o2hU/GjWULUzEqiUk7xolA9qJhDT+hyyS0cMfEEYcImQDz/x5/AEkO b8EaNbX7AmsKEl4KSVE3DeeVYj2+a1yS2ffnAqvoaAuHc18HVKHw49+pxmeczSNTzv/x mT93zScdqYZ2P5fwbznN08mY+FVYou41RjXSvsaPfULufY7Ll4+zqtBkjiSZvf55ID5O 4c0KrSHCf/LG3Xfhr8dS3M6vHw52zqZyPLnzPUGG5gT69cC/ELEOmRLfRulTDaihoSI7 9Orw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778257217; x=1778862017; 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=tHeQ0RvfaPoCSBPza9VvcReWRUsEKtq1mtgPNpsP4iY=; b=MiLpE7EwmtaAoYgOiTqBPE09ikiEk4XRyC6kuKm9p6E27V1YMFPbNTj7qhX6wQIn/W jkXk4XeKHolIPtC+P0iyqKhBdMTpcZ7FyNMWbomuUaO1v1CpVDZN2zqgnpHaecqgwsx5 HSQPUNqdSNHC70hV50PvAQfeA8U5clFtHfHPtLfVIlp1qXWG/MBAiUx4ySxdSCwuX+7t bEOXme+zbVCyodAR+E1NQ6FAkEwo84/lclf555T66ujbTwvGsujmJOp6bYmnRshOTr6A 9I1eYxGv+9DIaiwhJqsZasYX9ncD5uOVjzcpEDjMxVIKynEroPmk4thLvp4Bp76gGiTt a2qg== X-Forwarded-Encrypted: i=1; AFNElJ/Na/eSf//Ztz3o0jQjmz4G/pz0xQ5hufnk7y2eu9CrdOqC2X/MxyQ1OC7K6qRiP3YcEMMA7IrwloQp@nongnu.org X-Gm-Message-State: AOJu0Ywvq8EVH1jXhy7xG26W1e9/0XXmqanOTOAhX/4uYatUCdGPVLsq wCXUwkYOu7QSpIbBXEGvk9xANL+jKqjhoLOE0Bob8mVMNbeUaY8CDI9LBWrWx72h3Rs= X-Gm-Gg: Acq92OHVVsnf3+THeh+t5ciAYe9n6sZ4gAhAVDLRlrre8p3ISEX5DUh/6eyWHjaNHpL jDn3KIPher5txlNRXvTm02cj8f3Hp4dyXUQ0mE/wJnbdFOJK9W5QLEpC1d1Uf2+2hzO4X3yQ7F6 MAZYKOFApI49wyZLQCwF0LenStROwb6VGBYyWihBl9e2iyvi8uKiIaKUiibWu0z64UT8+e2X5X3 QE+uln4utocxv+5qa1rTbJLqSqfGTUGze2xcvJlRMye5XgfPIYWKJviY4Jwi4NpUtHaeKehHIGY UqD7a8viYCr1T9pziMEN16J0bkMnMdpd5P7BGuIYvn37eW1RxKpr4oheJJmDGvQFZs/vTGJyxCY BSMreXb+OvrVg2zjIIYDexgo+oY4HrtHFJr14JhaVnBbR1g8mwP4suiIfvJ+P6ZRgmi/4JeH1J3 ISgGQjcGS1lmBHKMIXNU5hnBeXLzKuDi16VI9V0nKZtyDot9Qa/MzDzgjmRAv2Q+aPUX5iWXu3j JBhyPDoAMWIS32GJ5cNqcq49hYodJI= X-Received: by 2002:a5d:5d03:0:b0:441:1c95:17e7 with SMTP id ffacd0b85a97d-4515b5243efmr20254181f8f.15.1778257216862; Fri, 08 May 2026 09:20:16 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/4] hw/misc/bcm2835_control.c: Don't assert on local timer zero reload value Date: Fri, 8 May 2026 17:20:10 +0100 Message-ID: <20260508162013.2751001-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508162013.2751001-1-peter.maydell@linaro.org> References: <20260508162013.2751001-1-peter.maydell@linaro.org> MIME-Version: 1.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.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: 1778257302655158500 Content-Type: text/plain; charset="utf-8" The bcm2836 local timer has a basic "counts down, fires at zero, and reloads to programmed value to count down again" functionality, as documented in https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2836/QA7_= rev3.4.pdf The documentation is very sparse and doesn't say what actually happens if the guest programs the reload value to zero. Currently we trip an assert in this case. Instead, log this as a guest error and disable the timer (which seems a reasonable guess -- effectively the timer will stop counting). Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3395 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- hw/intc/bcm2836_control.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c index f1deafaf7a..d6c6057cd2 100644 --- a/hw/intc/bcm2836_control.c +++ b/hw/intc/bcm2836_control.c @@ -197,12 +197,21 @@ static void bcm2836_control_local_timer_set_next(void= *opaque) { BCM2836ControlState *s =3D opaque; uint64_t next_event; + uint64_t reload_value =3D LOCALTIMER_VALUE(s->local_timer_control); =20 - assert(LOCALTIMER_VALUE(s->local_timer_control) > 0); + if (reload_value =3D=3D 0) { + /* + * Spec doesn't say what happens in this case; treat as a + * guest error and stop the timer running. + */ + qemu_log_mask(LOG_GUEST_ERROR, "%s: local timer reload value is 0\= n", + __func__); + timer_del(&s->timer); + return; + } =20 next_event =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - muldiv64(LOCALTIMER_VALUE(s->local_timer_control), - NANOSECONDS_PER_SECOND, LOCALTIMER_FREQ); + muldiv64(reload_value, NANOSECONDS_PER_SECOND, LOCALTIMER_FREQ); timer_mod(&s->timer, next_event); } =20 --=20 2.43.0 From nobody Mon May 25 20:33:14 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=1778257287; cv=none; d=zohomail.com; s=zohoarc; b=MpR8SUOBGCs7QCp1iQJmi5kcFS+THNfTcXvawIyF08FhglmYQ9U31GWN1RAAuafQepVhtAE9ylI6Fc5FoYhYJZc/gKEtamzSLijF6ASuKklc5BHX1Y8CSDIRhGzXLLSWu68bElbLQig+Yf6BbU3GdH9LwNGg+bgBghAkzD7IY+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778257287; h=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=OaU3MPZPkbJoZGqSP8BLpDOjdtgxC4ERc/Yo5Hf9mI0=; b=ZulacadEJJ++RWTUL6JxzDMzMZTQDuOe1fZvPSQ/yMRepnGhV/igQg2vLVHHOZ0eDMLlQGG+hvCLdEVsnVPYveSP/OZMYwu3tvOwRaGlBgF58E5surPtJ/ynfwMXmTt01q6byZarbCTrDZUhnMSl4z8Pmcj879NGvmVGLfoJj5I= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778257287216698.8881843493115; Fri, 8 May 2026 09:21:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLNw7-0001Mc-Np; Fri, 08 May 2026 12:20:23 -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 1wLNw6-0001Lh-Ix for qemu-devel@nongnu.org; Fri, 08 May 2026 12:20:22 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wLNw4-0000xO-QG for qemu-devel@nongnu.org; Fri, 08 May 2026 12:20:22 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-43d7645adbdso1299855f8f.1 for ; Fri, 08 May 2026 09:20:20 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4548ec6aea4sm6226998f8f.10.2026.05.08.09.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 09:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778257218; x=1778862018; 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=OaU3MPZPkbJoZGqSP8BLpDOjdtgxC4ERc/Yo5Hf9mI0=; b=Vt9FRWifByWBTqsDttJkPLRfT9W/JlkFjr5VOzvDfb73m7OjJsTmLF/iDitJmpqame v6vYGEvTO7RYo/QUUXSHWRBvdXEMqZV761CmDwZke00rftnHIrvO2rQNFb/9kJO5H6cb EeBqiYaOFCAPA5cvkJpDZQvBemUDQrv5nn+bki9GlJ3wt31qIhD8PcRTnXJVohggMt5x kUuCnZN/Qe3WZBqhhyKBIa+BVamIUS/nZ4U1cu1P1bznRCSL11Cl+2MK9Jjdqm7UEtLN yFFPGHoz0/0wUZSs29g4O08LWqxbCU6pLQnk5B8xv7lYhqalJQDSkMJPOO9lkSIrMFuW cyQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778257218; x=1778862018; 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=OaU3MPZPkbJoZGqSP8BLpDOjdtgxC4ERc/Yo5Hf9mI0=; b=du5iQVVp3sCI48RKnHcwAAGllnj3DJoCwTEtCpiZqe6gcMXvB4L78mnRePBKomKs27 tnB7bnQL9dJZZuj+2x+1/Uri+jEVXIiwdoLLjG60rJBRrIfF214mD3jyZsoF3B23Zsot +JRr0CI0M6hLN2nDbnyXxdW/M4CgCArlvKw7LsUZyiimuOUhVo/jlM4OOs15Nka4RCFQ 98fbuJ8OZtxh4wTupP/x0WbtVSzwimdhRPHELKmP7SOyUiTpIVkcvcTwWNJqpFK+6v5w 9JBllwyk9b2AuQEqQIRN5FEclmhfgHOINvCl0sVfhFCMZR3FsBG4lJbRrbLzJ3V0mmcJ XN6A== X-Forwarded-Encrypted: i=1; AFNElJ/66nw0H5GR/lVOPmlZwFHuYU/QYEZJA0FukdTplpmdSUXsLWfQODbr2O59M47EfYCD8Xkb7GRkjetB@nongnu.org X-Gm-Message-State: AOJu0Ywq1mgYHJCMoFwKsZw0A0pp5JHs1e65Nkqh8emNMct8fAiDpWxr keBZ7ynRcoCBAmTLTBQR7bUC/CiTXUNLmAAm7C5bhkZdDEklcOAW74x6qUNxc+80rX0= X-Gm-Gg: Acq92OFXt2rgalc+ivz/BrDLRCrSflq5xIa2KQQHx48onQTGKDehbd3zK68pDAJvmhW BGz2dXdHXlJFg5aDEWNxmHd+3VtL0S5tZbhelKl9SZkRpqUHHdQb0UWI+h7xI57Cr/KYDN72Rol CM6nYD4Gl8ri4UXpkGo+jsGBYOH41E1gGwKLrUF7qu9KqfbCeYUfWokjoRfZCRJpjvIB97nlVTN CEDxaNJFAlqHqDT4eLPHnORxjeynZfGWy3kQazvjhYBYUB5R13EeYVBIU6+Q91/WGYVr806Urhm Y66cmPK3nfyHTeBvrqrVrtYaMmDrcO5pdED+apwyEQEodmkuK38S5KeAK21vt5TEqqG1+qSzqI3 feaWyKqO0HvqR3Ta0OBnMwLttKjV1uZDw5uo/bhQvSg5m+znvfi7vFTvH66cWEeerBNXy+qKqa+ cH/gFolZYhwq+eRj1UPzpSGWxgbkvChHIe5x39h2ifWaAKktJ1vxZAhyAGRfGAp/76IgRuAoa2k H1w/u8wf9sZLBTqfPHnQqlD5zZHexY= X-Received: by 2002:a05:6000:400d:b0:446:96b1:f5f with SMTP id ffacd0b85a97d-4515b05717bmr19014283f8f.8.1778257217860; Fri, 08 May 2026 09:20:17 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] hw/arm/integratorcp: Use LOG_UNIMP rather than hw_error() Date: Fri, 8 May 2026 17:20:11 +0100 Message-ID: <20260508162013.2751001-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508162013.2751001-1-peter.maydell@linaro.org> References: <20260508162013.2751001-1-peter.maydell@linaro.org> MIME-Version: 1.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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=unavailable 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: 1778257288518158500 Content-Type: text/plain; charset="utf-8" The integratorcp board has some onboard registers which can be used to raise IRQ and FIQ to the CPU; these outputs are supposed to be ORed together with the main ones from the PIC. We've never implemented this obscure bit of functionality, and instead call hw_error() if the guest does try to raise an interrupt this way. Replace the hw_error() call with the more modern way to note unimplemented QEMU behaviour, a LOG_UNIMP log. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3406 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- hw/arm/integratorcp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 164af03f7b..c25bbf3c82 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -23,7 +23,6 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" -#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/sd/sd.h" #include "qom/object.h" @@ -178,10 +177,17 @@ static void integratorcm_set_ctrl(IntegratorCMState *= s, uint32_t value) =20 static void integratorcm_update(IntegratorCMState *s) { - /* ??? The CPU irq/fiq is raised when either the core module or base P= IC - are active. */ - if (s->int_level & (s->irq_enabled | s->fiq_enabled)) - hw_error("Core module interrupt\n"); + /* + * ??? The CPU irq/fiq is raised when either the core module or base P= IC + * are active. To implement this we would need to run these signals + * through an OR gate with the PIC outputs. In practice guests don't + * use this, which is intended for an external debugger. + */ + if (s->int_level & (s->irq_enabled | s->fiq_enabled)) { + qemu_log_mask(LOG_UNIMP, + "%s: raising IRQ/FIQ via core module registers is no= t implemented\n", + __func__); + } } =20 static void integratorcm_write(void *opaque, hwaddr offset, --=20 2.43.0 From nobody Mon May 25 20:33:14 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=1778257296; cv=none; d=zohomail.com; s=zohoarc; b=ER+R886A9j/o+ruI8lnLLm6tGYAXu/6aOvl4wmoUpQRH3m3QzeunNbvObGCpdbL4BA1A8f8ULuPBKck1AoovcLmmUHW98QFdtUHOq37ILHQtime+o2atRLNpebBMqyh605GrAyVUsM88mw5ut74HYxzXixf5dhTXd/QLVS7a+Cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778257296; h=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=LTDqMeLcyGj/NXygQntrcbmLjmm6kj/aNSi917QkrfA=; b=AgSMzG954INbz2POfUSHZbkNtpWarvnJAaJzeJBPWUb1f5bAZ5SJ0kgs6f5p/ky/YMkYcX4fYH3q5BiLhBOJKpsp1AQh7d9YOj+B9oHf6YoPiYlPpq5dSEpmjuuhsUDWR1M6++nYH+/WM0jkyYh/bWIELZOY7B0kb1sV31cLl78= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778257296947533.5191855373705; Fri, 8 May 2026 09:21:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLNw7-0001Ms-VW; Fri, 08 May 2026 12:20:23 -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 1wLNw6-0001LI-5P for qemu-devel@nongnu.org; Fri, 08 May 2026 12:20:22 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wLNw4-0000xG-D7 for qemu-devel@nongnu.org; Fri, 08 May 2026 12:20:21 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48a563e4ef7so20305085e9.0 for ; Fri, 08 May 2026 09:20:19 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4548ec6aea4sm6226998f8f.10.2026.05.08.09.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 09:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778257219; x=1778862019; 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=LTDqMeLcyGj/NXygQntrcbmLjmm6kj/aNSi917QkrfA=; b=WwhJejmzrfOEPhii6BcDtt8HGwAXEzXDeNiSxnxDGgEmzX3S0jvi46g360z0nsDG3S p4BtLNFBx7RB2hldaxT+7geY6i5wG2PZLXs2dLxwKnEwA33omlHzWCxaTvlajKSXT4Dy YhWl3GgdZffV00SCLE2Sol7NTBPh2k/Kl3MeaOydx7Xsf5gdf37z7bkyWbg9/5I4/hYZ jmJ2RXArFNmLt5WnciFbIFXIuviWjNYI7h8zKAqT9tIREgkYKjfoiVjy7FNiVEPtuAn+ WzqdxKq00tZn6/dhlIVnOdVo4xppWuyV4EkoXRcNRxoXwvYnk5kszqN0+uABvpoAKvXT 7bow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778257219; x=1778862019; 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=LTDqMeLcyGj/NXygQntrcbmLjmm6kj/aNSi917QkrfA=; b=eNH1IrhHxUe0WGqnJvGpiWBndLl0jPoVBP/1ICA/cs8Dmy7m+Vf3BhjvAr2bhgNVug arQj6iMSs4DYpYUoEAk1G7EixyRi0FCHddArcVCn+iL4n+uVynToG0CLzV2JwDDQZhOX rimPXdH3rzdNrld/xDUnm6vlKwkjWv4ugXHqlHHcotOSk7ff2oToMZXWxztpfA8Q0PhA wO9mXqYq137T2P0o6cTFOLxbaxq1iEime6FFVCnVykPVKpi6G57Gw+qsXLOjPmE6WE2p lnY6IO697npBnCOZOVKO602GpJH+gUdJsuPj7ea/zfb4lW07uIEB36gvcTWqvHWnHS4/ LHBA== X-Forwarded-Encrypted: i=1; AFNElJ8/M7clxFkcc7/58kzcbhdU/ZHSnq2XMy8p8c5qpAL//FDzdLrgm3T2ucEvanYys3aE2MNJL+PLfTSA@nongnu.org X-Gm-Message-State: AOJu0YxBU9IRadxG/u8SkJUgfa4KSeSgO9BcRzfFBRJmuC4/VlG40nn1 kCieZ6bur8+59bs7Zzp3a/fEYgtYfFzQlsC8fXc2ePMwwqStp0YZfHakd5G+Maw+oDk= X-Gm-Gg: AeBDiesltlbNfpU5AAT9yzVTNhW3juF9rjn6MB6YBnLMnRZ/YQ+d7qsGnty5v4rhpkn hbVKW5s6XsURjgjIzn1KIINbVslFrPCCdkzsE3rZ4rwagyMhMsBswfNMVmL9cuzonS0pyrmEw0c CTMTl/bOgmmSawyIUjd1Q8/LaE4jHRBNDkHXstzzaFRAcT+YkrJ2t6kgbXwJuzecOAYCoGB4Lxm IitxopJ3abDdD8Tx9mnIDo0QrdNk9I/kEeo5j1nelSq+AiqlRvj+aknwNFcie1LDcQLOW4EQic7 4JGRQlj7FlpFzc2rSWA/5J2HGJNKOVbmHQ7sOktUhIlRzeSp/BaBoU44c+SYncwP1u1GcEzozbS 8Spg3kESh0yxMzbCzM4yR4h5cesCbb8jEXF4jODvgK+BvM9pbqcn9QYgSEgwENzynoyXLgdwj48 iDvi74PJoYQY/hPmAXuGqyC9NtN4cjkAlaq1iHC5w+DNlqgleDE6lcei+ATnTp41a6eq2/QHg2L qkAb5yHQ9U51ovhXe7VVpQAY8VuMhY= X-Received: by 2002:a05:600d:10:b0:489:a4:e555 with SMTP id 5b1f17b1804b1-48e51f36fc6mr176894445e9.21.1778257218794; Fri, 08 May 2026 09:20:18 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] hw/display/exynos4210_fimd: Use LOG_GUEST_ERROR instead of hw_error() Date: Fri, 8 May 2026 17:20:12 +0100 Message-ID: <20260508162013.2751001-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508162013.2751001-1-peter.maydell@linaro.org> References: <20260508162013.2751001-1-peter.maydell@linaro.org> MIME-Version: 1.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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: 1778257299271154100 Content-Type: text/plain; charset="utf-8" The exynos4210_fimd device model uses hw_error() in several places for "the guest set this register field to something out of range"; update to the more modern LOG_GUEST_ERROR. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3405 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- hw/display/exynos4210_fimd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index a91f04aaf7..0c9e42ec52 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -533,7 +533,8 @@ exynos4210_fimd_palette_format(Exynos4210fimdState *s, = int window) ((s->wpalcon[1] >> FIMD_WPAL_W4PAL_L_SHT) & FIMD_WPAL_W4PAL_L); break; default: - hw_error("exynos4210.fimd: incorrect window number %d\n", window); + qemu_log_mask(LOG_GUEST_ERROR, + "exynos4210.fimd: incorrect window number %d\n", win= dow); ret =3D 0; break; } @@ -757,7 +758,9 @@ exynos4210_fimd_blend_pixel(Exynos4210fimdWindow *w, rg= ba p_bg, rgba *ret) blend_param[i] =3D FIMD_1_MINUS_COLOR(bg_color); break; default: - hw_error("exynos4210.fimd: blend equation coef illegal value\n= "); + qemu_log_mask(LOG_GUEST_ERROR, + "exynos4210.fimd: blend equation coef illegal va= lue\n"); + blend_param[i] =3D 0; break; } } --=20 2.43.0 From nobody Mon May 25 20:33:14 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=1778257248; cv=none; d=zohomail.com; s=zohoarc; b=iAheFVKq7Xbvwsb1IW0zgAssYT+k7Qmz75yptnemQ3mUacLYB+K7q8PoOPDQzhWwwDRoYGJfIfweRi9mA0+/L53bMwJrC2NYaEuRA4e2MxXsDof/vi17UWDZhYko0o2+rdAWqPpVxcjaa2EpUPx4gBKu83qzt5O7tFk/ZnrxoFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778257248; h=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=9PtzGnpVjDazZsMTuEWeXTJxfwNGMpG9knZvWyMwkhQ=; b=mAMSV+M5d16YKDdLknPH20nACjHZ7N6XvAsQAAXPattpGeiBuj7fr8lgICICCc8xBm4CUfs0ma/3yMchVglyJlSxgH15tY5wU52AV4axcSnJWwT8ZfoniyNEw8BE2oSrsIVnesr3l8VCZZ82X6+Rym1/JDQeoUxfeZShoXmQajI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778257248310544.97813519301; Fri, 8 May 2026 09:20:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wLNwA-0001O2-JM; Fri, 08 May 2026 12:20:26 -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 1wLNw7-0001MY-I4 for qemu-devel@nongnu.org; Fri, 08 May 2026 12:20:23 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wLNw5-0000y1-NA for qemu-devel@nongnu.org; Fri, 08 May 2026 12:20:23 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-449d6c68ed8so1797659f8f.0 for ; Fri, 08 May 2026 09:20:21 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4548ec6aea4sm6226998f8f.10.2026.05.08.09.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 09:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778257220; x=1778862020; 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=9PtzGnpVjDazZsMTuEWeXTJxfwNGMpG9knZvWyMwkhQ=; b=G3Pe80YZUGdSrffvRbxPcuKcoT3Fb4+VbyjnZevDwjdimyMHeX94oGHtew0QL+3vcD xouybegJJbxby6rnnL9V6TldWHePVZEuewuFvcemh+16Puigf/cftoFm2/E7Oz0elqKg VkW+k1Ig7ZDQDoDiTM+hwba+CzB/UlkY+ukjPJWNJ2n3zL6FX3S2GC/aezk1/Bvi+Yrc iOwhQW7MvFtwW5Q0wIkO5pfAdhy8a/7GoX4p6gSqteKEhW/AjWuquoZJAtjRqN/9XmPC R1vFfJ20COV7makuoav2oNU4gt4Vd38L1SZ4qktQW07WpecfbysWhw4gOeqgqWpZPS0e O6mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778257220; x=1778862020; 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=9PtzGnpVjDazZsMTuEWeXTJxfwNGMpG9knZvWyMwkhQ=; b=JlpOiDEw6VSU8cm0a0hnlmn/xNfP6qfeF7CeDl/4nzHIPDjOWD944f7HhvvzGy5HyO /S/Y4Q2eilLwAJWZMlbRII0BSFvaOaRRLyUqK5Q85FiDOrTfXuCisZq85XVVP/JLYMZH o07IZgGBEnCrMSe6MkeoPVUY8T3kEuWy5Pk9dh1q+D5yGuP0TERsGVCLmP1iKoTtlAKd jXF+O3tGKkaKRB8doNY1re1YXHeSPm8AIpPL3FVC4tF2BiJKdtZbDZ+1brQiu4Iu+Jaq 0cNTnT+Ne40h+mhPfb2Ck+ty1+Tpi5dc3Qo4OqpMRJ5RQwmddUszWCtqIHMM32SOy/YV pCbA== X-Forwarded-Encrypted: i=1; AFNElJ+0p1wAnOVEwQxLBgx8Q/zRauX1CL4GyaDXiqczRVZSo2rjoa8qdseK589YHZnjw5BP1CfI0b8q42eM@nongnu.org X-Gm-Message-State: AOJu0YxA0wCGHG8Re+QX5EvgIxgpM+NlY/M3aoxKa7OpvCn/8bAwY+B6 bJgVX9x9Rk3AUIUrsJSWPUeok91Eu3RlFB7aRAZ4LKUa04Nds3qIKJ3R376MH9MreLk= X-Gm-Gg: Acq92OGqRvelYMQ7l2E+M+ivAKO2BtH8Fi+RDlPq7EA9FnKo8ivRUHXIpAZijsEqCmg b88amLt6B8+fJvDVpfPT0/naxPdu4anZLAwkwMlkOrsWwtrnd4EHrQ6bBWcVOnU1oYNq/zXSSbq xS1TuI17gsZnT5Igj/ZgrmUNIKESh2aTWy4jg0rXP2syTPMBSRNB4Dpt9BYNOJUE1OW3JyhIOjP DQ4IG5mDCKF8xwtMNrQl29pDsXwfhNHiTSBbOU8BfUafHKeEvMUpoEGZPJrofwYqsYje4qTqnEp jING+SkZxVO9DDlLrjTy6D5qhGNGb92Gknul7Mo9nAJTXhmfzbmPawJUfqlg4NAjoVA+fiBmIzQ MXxO/h50sQti4VOHk7QmXdGhGv6RtJ+VXoENQZvKnbBt+0iwUmNyRdrQns9pl0dsEVPhVCxOykf CyOi+ur+Hn3lJnHucJOKUIa/gCzSeHK+0iAwi9S5cpASzfkl9/0s8QQqPGzAhnxFnkUZtK/TERy fGvl1g1WYxjBwOr0NiYRELc0MRLSJowPnRyzcMyfA== X-Received: by 2002:a05:6000:1a85:b0:43d:26a2:f8c3 with SMTP id ffacd0b85a97d-4515d3dca3cmr20624415f8f.35.1778257219837; Fri, 08 May 2026 09:20:19 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/4] hw/display/exynos4210_fimd: Assume display surface is 32bpp Date: Fri, 8 May 2026 17:20:13 +0100 Message-ID: <20260508162013.2751001-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260508162013.2751001-1-peter.maydell@linaro.org> References: <20260508162013.2751001-1-peter.maydell@linaro.org> MIME-Version: 1.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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: 1778257250800154100 Content-Type: text/plain; charset="utf-8" For a long time QEMU has guaranteed that the console surface is 32bpp and not anything else. This old display device still has code assuming it might be something else. Remove the code that made put_pixel_toqemu a function pointer indirection, and use put_to_qemufb_pixel32() directly. This removes the last hw_error() in this file. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- hw/display/exynos4210_fimd.c | 62 ++---------------------------------- 1 file changed, 2 insertions(+), 60 deletions(-) diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 0c9e42ec52..daed85e22c 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -24,7 +24,6 @@ =20 #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/sysbus.h" #include "exec/cpu-common.h" @@ -867,37 +866,6 @@ static void draw_line_mapcolor(Exynos4210fimdWindow *w= , uint8_t *src, } =20 /* Write RGB to QEMU's GraphicConsole framebuffer */ - -static int put_to_qemufb_pixel8(const rgba p, uint8_t *d) -{ - uint32_t pixel =3D rgb_to_pixel8(p.r, p.g, p.b); - *(uint8_t *)d =3D pixel; - return 1; -} - -static int put_to_qemufb_pixel15(const rgba p, uint8_t *d) -{ - uint32_t pixel =3D rgb_to_pixel15(p.r, p.g, p.b); - *(uint16_t *)d =3D pixel; - return 2; -} - -static int put_to_qemufb_pixel16(const rgba p, uint8_t *d) -{ - uint32_t pixel =3D rgb_to_pixel16(p.r, p.g, p.b); - *(uint16_t *)d =3D pixel; - return 2; -} - -static int put_to_qemufb_pixel24(const rgba p, uint8_t *d) -{ - uint32_t pixel =3D rgb_to_pixel24(p.r, p.g, p.b); - *(uint8_t *)d++ =3D (pixel >> 0) & 0xFF; - *(uint8_t *)d++ =3D (pixel >> 8) & 0xFF; - *(uint8_t *)d++ =3D (pixel >> 16) & 0xFF; - return 3; -} - static int put_to_qemufb_pixel32(const rgba p, uint8_t *d) { uint32_t pixel =3D rgb_to_pixel24(p.r, p.g, p.b); @@ -905,32 +873,6 @@ static int put_to_qemufb_pixel32(const rgba p, uint8_t= *d) return 4; } =20 -/* Routine to copy pixel from internal buffer to QEMU buffer */ -static int (*put_pixel_toqemu)(const rgba p, uint8_t *pixel); -static inline void fimd_update_putpix_qemu(int bpp) -{ - switch (bpp) { - case 8: - put_pixel_toqemu =3D put_to_qemufb_pixel8; - break; - case 15: - put_pixel_toqemu =3D put_to_qemufb_pixel15; - break; - case 16: - put_pixel_toqemu =3D put_to_qemufb_pixel16; - break; - case 24: - put_pixel_toqemu =3D put_to_qemufb_pixel24; - break; - case 32: - put_pixel_toqemu =3D put_to_qemufb_pixel32; - break; - default: - hw_error("exynos4210.fimd: unsupported BPP (%d)", bpp); - break; - } -} - /* Routine to copy a line from internal frame buffer to QEMU display */ static void fimd_copy_line_toqemu(int width, uint8_t *src, uint8_t *dst) { @@ -938,7 +880,7 @@ static void fimd_copy_line_toqemu(int width, uint8_t *s= rc, uint8_t *dst) =20 do { src +=3D get_pixel_ifb(src, &p); - dst +=3D put_pixel_toqemu(p, dst); + dst +=3D put_to_qemufb_pixel32(p, dst); } while (--width); } =20 @@ -1336,7 +1278,7 @@ static bool exynos4210_fimd_update(void *opaque) int bpp; =20 bpp =3D surface_bits_per_pixel(surface); - fimd_update_putpix_qemu(bpp); + assert(bpp =3D=3D 32); bpp =3D (bpp + 1) >> 3; d =3D surface_data(surface); for (line =3D first_line; line <=3D last_line; line++) { --=20 2.43.0