From nobody Sun Apr 12 05:51:24 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=1771277553; cv=none; d=zohomail.com; s=zohoarc; b=GOjeWVdo0eUFZ/0wW5aYrqGi41wWuj8i0E6Ts2wm4LWBG/Po3Ow49HAGepOq4WQ5gU9puCjat3J+ZV3dDVUk9y7pqmlGE99oMCe7LQf58qxVncZGVA8uvCNFZBMvKVYieGpWzDAA1uYUuq6rLgkgIFuV0nJWy6f/fTeGYaxXyhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277553; 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=yqLUEfFp4yyvVrqD+DcLUkS33yg5lEUMmYhr1LZOcgw=; b=Px0Z2PqcqhnT2AGDxskkkGJiPrNcw4gJJGPTiGLmrPZAAzkFySvUd+1xviUuxYh95K67gqhVaxxyKEsrxf7htSxrbpOXZEZBUvoAjAGDPhrVRsn9FvqBtEy28xyxL5kE+yP52veN+SFS6MKE/ixDKg5dL7xa5IzUVPKifF1G4eg= 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 1771277553499362.2331080190843; Mon, 16 Feb 2026 13:32:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6CB-0000Ji-U6; Mon, 16 Feb 2026 16:31:56 -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 1vs6Bs-0007Pi-SQ for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:31:38 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vs6Bp-0003xq-BT for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:31:35 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48375f10628so20541325e9.1 for ; Mon, 16 Feb 2026 13:31:32 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796a5ac92sm29582865f8f.1.2026.02.16.13.31.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:31:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277491; x=1771882291; 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=yqLUEfFp4yyvVrqD+DcLUkS33yg5lEUMmYhr1LZOcgw=; b=Vlfm57pGSoHFKM9CfDmUOHuG+XjNWUQMA5ZYu/2+WFdpK74oBk3uDcz3rpJ9Rg4/11 vIArY6xpR6ZvCTA0tVWS7UUBeOQ3LS5dVudE0gFWWo1Y+AOUBCSIL91fuXqfhIRzQmR5 qm4Q4IbHZaA3HMDW13X+oaliGKeMpfVQi34FA449uPMcsoC3FCiRsl1G0IliNSZwPE1w ffOY8qutTAl2e0I7mFPpgNZWoxzXIPAkHYfm06Vj8NUa4OCZdKCJiribxygWgPymAeEg O84EnOHRZRU3bYVAWJ+JEl99Cecv+hVj/qOONIQlrksHgJg3R1CKukxtREC4hmCcXFA5 H68g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277491; x=1771882291; 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=yqLUEfFp4yyvVrqD+DcLUkS33yg5lEUMmYhr1LZOcgw=; b=LLfDhYo3qhZWLKvmGrD10MbpkYlfyVTGktXNPr/qVmPy3JRmvu5oxHge1LP8QP4TRI b3OoCd8OIxXhqKL7L8DsRWFlhdrll011yTGUvEE9W5LdmwzufomqITBljiCSHdOgPiRd eQePLazYVpuwkH/D1Q3S4PTtB/4K8r6SC8ag9gQD5wN6/k+EgKVXCLMWAoVNsUvRJFHq SXL+b8nIJ+WBdI6Xbik7S4fVIScRTfl7EfGr6SmzX/2O8Ah0pH23aV1/nRDqj3kpNSst mgYho/TPp1mE2eFrUczE8Y7U6Uq2Do7L2NbTJodOfadVGvdTFFFpJhdj4jxBq9szH833 ttJg== X-Gm-Message-State: AOJu0YzxLysJTm3PxWqBy0ERkwogDho4JCd0DM2AJqxYhkWiEV0ZyU5I y8FpcbOM1wN0+TErOtZ1hMN3QRIZG9iRXgSCKcKlayLe9bfB6NUpWUufzOnBLzeYw/Cz1bYOHjW 2xfzRYIg= X-Gm-Gg: AZuq6aLIDkQy1gq0IKppTBZX8Al/mGgZwYwRwd7CUCdovEO0dfpXy3NUUR7i3XPcKy0 zLD2szEQGs90GKBnX7YwgmfFvagisDk4C0IDY3H+UtjxUo1E0/xgyIDuym6Ghr8CgEziqD+8YSP OmhzkXEz4WkL+7SPmSZmTGDjyknW3D/PYBZVcqDc21ESe9WpshGDNNRsU8oI2R/jne1Vv7ZceEb bFSa0xZkA2sfUq3A19D2G7AgKXR+btLl8madgq0TUOmeY96NLkuO+hiUe5phjTkEctsRMQNcyKM vpd2FB0+y6fm0uB0qXZFOxxBEEhkqdMG0xgqSlqfIZMVwIugCynjXlYmook7eSSMSrfuxxOFIj3 1j2tmtvXqhcoUGKuo2+5h0nCowUjHnB5wZLx1wXnOULK74wVjm1wMNMeggPmLwr+W/C1QsddeiA FPIMR6BV0/DhSGPxwRZF2+Fybgc1N9tFuZblMfwKp5oNBpobjZvIklBTa1pQqcfnXfK3w3TMRY X-Received: by 2002:a5d:5d06:0:b0:437:6f0c:2ed with SMTP id ffacd0b85a97d-4379790f0a9mr20966358f8f.34.1771277491139; Mon, 16 Feb 2026 13:31:31 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/8] hw/display/macfb: Constify macfb_sense_table[] array Date: Mon, 16 Feb 2026 22:31:14 +0100 Message-ID: <20260216213121.47122-2-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1771277556436154100 macfb_sense_table[] is only read, never updated, so can be const. Update the single call site, macfb_sense_read(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Mark Cave-Ayland Reviewed-by: Richard Henderson --- hw/display/macfb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 388f8de5070..57ad8ad5587 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -82,7 +82,7 @@ typedef struct MacFbSense { uint8_t ext_sense; } MacFbSense; =20 -static MacFbSense macfb_sense_table[] =3D { +static const MacFbSense macfb_sense_table[] =3D { { MACFB_DISPLAY_APPLE_21_COLOR, 0x0, 0 }, { MACFB_DISPLAY_APPLE_PORTRAIT, 0x1, 0 }, { MACFB_DISPLAY_APPLE_12_RGB, 0x2, 0 }, @@ -342,7 +342,7 @@ static void macfb_invalidate_display(void *opaque) =20 static uint32_t macfb_sense_read(MacfbState *s) { - MacFbSense *macfb_sense; + const MacFbSense *macfb_sense; uint8_t sense; =20 assert(s->type < ARRAY_SIZE(macfb_sense_table)); --=20 2.52.0 From nobody Sun Apr 12 05:51:24 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=1771277574; cv=none; d=zohomail.com; s=zohoarc; b=epPewN0Q9ERovqmflx6eQxUQ281H7/OY9HNXjMZfUzvg1eo4CGicA/5+x8HaDRiepH1hy1Q3K9DKIU2rdha4wBcody0TjSuTwoM+qIw0G8r1NMnWKJoThieVxquYK8itMC4Ey4LwZnIJzS0jZ10XTFP20va0opUBRpw1tIojLSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277574; 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=ryaQ/AkO6jKX0PQ//vdGmEpeMhxdiou+ug6hLMUHQC8=; b=JYLcej/cDE91AOm1JL9P+IVEDQOlXNkBUb1SDpRlm47866k4dNElmrZau7evXyj4MB6yavYDj0etjtVFUrO3+4knwbpkXR16lCkH05BDVRNb9TjjS8KpE1YQVc7Ie0MG4U04XoM5WCg2gl8g+WaC3AxKTMlvJHzqrKN+/mwJ9zg= 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 1771277574951452.0196199946987; Mon, 16 Feb 2026 13:32:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6Co-0001Zv-WD; Mon, 16 Feb 2026 16:32:35 -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 1vs6Bz-0007tQ-WD for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:31:47 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vs6Bx-0003zH-9C for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:31:43 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4836f363d0dso30672865e9.3 for ; Mon, 16 Feb 2026 13:31:40 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48370a63afesm93274735e9.9.2026.02.16.13.31.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:31:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277499; x=1771882299; 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=ryaQ/AkO6jKX0PQ//vdGmEpeMhxdiou+ug6hLMUHQC8=; b=rg3pZiOk+YZKTiioXmikROsm1fdkwfEtkUYavO/Ygfq3gowsj/EJWcg5XoSyunk9+X +354Ix1IsP7phJ2ycpDxXfFJskP/+bX+z90i6RKDNF9AAV0kbRR0ZAYGlXwrqyRRsWHi bwyo3AKJYDyYAw/bxGPzFwOomqDWGfuPnOQxP+F/padpaxD4jKlLZU5eG36tWCjjp2XX f71gR8Z3oRyic2EPX7NnE2SptyPvGqx9wk2yKOtCukyszAAkdlVgMLY+tGhzzxRwUKMY vcV/eZyNla2L/hUufVJunmRLxJQhbY9m1H3+7FL9wCtmtcT1N0KGqSawPxsDLBo0p+F9 AVMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277499; x=1771882299; 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=ryaQ/AkO6jKX0PQ//vdGmEpeMhxdiou+ug6hLMUHQC8=; b=SmokBjxKvvI7wQ3ia3yPt5YcxU8GQYVhbk/ua90mOIATjUh3q2xYmEp+kQWIjAr5AE pwYduTcu73H47YFp28N/ZxVzSuqr6EH7Q3IYHMI1JkbSgefQGIORRvMVOHizYmK4dVg/ mRu5Qac/edOii2tyY9dznYbtlJbFBGrPILRcIRvparDz8yRu19mtKUZE6xv5vdwt/c1r zeW/AnFNMp4V8j9zQrH0eQvakqOirL7lKz0iBglEUYkEGXPyWmPHZG576IYi4yc0y28+ 0knc3S/VCVWhuJ1dxZoYt27Z9hzB7a/vCJlEgfDlYZH2m9NCXRpdc0MmiLCFFCl9ttAW 9Xog== X-Gm-Message-State: AOJu0YyIRWwH1NM9FXUPMKNe9aiQJ8PTu48irYYHv4K3Wcs2OhDEsMze Odxxvp7fp71D5wa+EatPiYqLH6ROKaNQgGaGlad+bp32OvWUZFSJjOrj02l6IOxOPk+RKXJHpX6 aMN+ekxE= X-Gm-Gg: AZuq6aKxSkX/StN30e+ywqHbh/qv+TmOgD/gxdVgvhsYISVlTLrVR2TNhIE3ZVygDp2 48+3uO/vxaVnsd9pMSTewpTCpc75/Xx3tr5bUW2uxyEI7gSZUM8Q8KD+S8B+rKasUPc+69vNODO OEKNmQfz/H+WTwGB7qfquBtgg959mym3XJEqyyP6VY7KC5pNTlt2PX6G/a9scLWbOHr6fB4ElBJ M2TBze+Ewdt9HiQPy4p3YDNpSxl1KqMTwufcsThrJsGaaNvtQ2gZKqbma0MlwBCN7SskD1ajFZB Mt+1wltXKQGghsyKeH7MeCBo1VXehVZYcIWTKU1yamV5i1gZkBRfzKQ3/18gHNWutw3FaLBEKvi g+ipfiGo0NQ+3CaoKxy/7IOXEaZmZioNXTskfaSElcrnrBbrpfQS30TX/PVRKZ0AhSZI+Id54Qk NqtiXQl5iMLMaZRaala5y5YfJvK/cGn5mtBDBgCfIg4BE2N56oUI3chdqz1MKnwnJqIwgiXg9c X-Received: by 2002:a05:600c:8b84:b0:483:4bbc:89ea with SMTP id 5b1f17b1804b1-48379c42db1mr156642235e9.37.1771277499064; Mon, 16 Feb 2026 13:31:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/8] hw/display/macfb: Constify macfb_mode_table[] array Date: Mon, 16 Feb 2026 22:31:15 +0100 Message-ID: <20260216213121.47122-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1771277576358158500 macfb_mode_table[] is only read, never updated, so can be const. Update the call sites accordingly. Make the MacfbState::mode pointer to const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Mark Cave-Ayland Reviewed-by: Richard Henderson --- include/hw/display/macfb.h | 2 +- hw/display/macfb.c | 10 +++++----- hw/m68k/q800.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index 495dead44b5..cb7aac7a4dd 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -66,7 +66,7 @@ typedef struct MacfbState { uint8_t type; =20 uint32_t regs[MACFB_NUM_REGS]; - MacFbMode *mode; + const MacFbMode *mode; =20 QEMUTimer *vbl_timer; qemu_irq irq; diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 57ad8ad5587..8ef174dc6df 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -100,7 +100,7 @@ static const MacFbSense macfb_sense_table[] =3D { { MACFB_DISPLAY_SVGA, 0x7, 0x5 }, }; =20 -static MacFbMode macfb_mode_table[] =3D { +static const MacFbMode macfb_mode_table[] =3D { { MACFB_DISPLAY_VGA, 1, 0x100, 0x71e, 640, 480, 0x400, 0x1000 }, { MACFB_DISPLAY_VGA, 2, 0x100, 0x70e, 640, 480, 0x400, 0x1000 }, { MACFB_DISPLAY_VGA, 4, 0x100, 0x706, 640, 480, 0x400, 0x1000 }, @@ -397,7 +397,7 @@ static void macfb_update_mode(MacfbState *s) =20 static void macfb_mode_write(MacfbState *s) { - MacFbMode *macfb_mode; + const MacFbMode *macfb_mode; int i; =20 for (i =3D 0; i < ARRAY_SIZE(macfb_mode_table); i++) { @@ -418,11 +418,11 @@ static void macfb_mode_write(MacfbState *s) } } =20 -static MacFbMode *macfb_find_mode(MacfbDisplayType display_type, +static const MacFbMode *macfb_find_mode(MacfbDisplayType display_type, uint16_t width, uint16_t height, uint8_t depth) { - MacFbMode *macfb_mode; + const MacFbMode *macfb_mode; int i; =20 for (i =3D 0; i < ARRAY_SIZE(macfb_mode_table); i++) { @@ -440,7 +440,7 @@ static MacFbMode *macfb_find_mode(MacfbDisplayType disp= lay_type, static gchar *macfb_mode_list(void) { GString *list =3D g_string_new(""); - MacFbMode *macfb_mode; + const MacFbMode *macfb_mode; int i; =20 for (i =3D 0; i < ARRAY_SIZE(macfb_mode_table); i++) { diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 25ddddb5d9f..4767eb4298f 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -255,7 +255,7 @@ static void q800_machine_init(MachineState *machine) int32_t initrd_size; uint8_t *prom; int i, checksum; - MacFbMode *macfb_mode; + const MacFbMode *macfb_mode; ram_addr_t ram_size =3D machine->ram_size; const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; --=20 2.52.0 From nobody Sun Apr 12 05:51:24 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=1771277617; cv=none; d=zohomail.com; s=zohoarc; b=FGcdjizUlec+mqhybPWjyTjUN2bg8MN0OXOOqaLjruSy9IvhxRddYcsHM3mgr+yWYlVbZScAmE/xMCOCAMviy+vK5XJ5lbjEMdV3x1l0h7AP6Hd8XugvmYkED8MCcuYwlJy8Yca4uS2ewWeBcCTyZ4BkALnlGlbRf5EOuF6Pyw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277617; 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=Z8hcPS7BagBRSt3osrcB1v/gm3R+JU/H0mFRukwg/xU=; b=i5uYwnetIxWM5Oq8KgrwdfTGNdFNkvf/WguVcxSQTdJiTiiTRYC4pF5ptdaZvIfm1tZWhrk7o6sOnHLFtTqA3XHoWLjlNNGnXdoxOpVeksgSqaypLfINSuZPE9PbJAwbkY1i9BCesvNoATxjyEdwEiFFb8dkmZfHPNfEmi8jIrc= 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 1771277617981188.04414116155806; Mon, 16 Feb 2026 13:33:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6Cq-0001pL-7W; Mon, 16 Feb 2026 16:32:36 -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 1vs6C6-0008Cp-Je for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:31:51 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vs6C4-00040S-VC for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:31:50 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-481188b7760so30183165e9.0 for ; Mon, 16 Feb 2026 13:31:47 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4834d5d78cfsm706462525e9.1.2026.02.16.13.31.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:31:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277506; x=1771882306; 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=Z8hcPS7BagBRSt3osrcB1v/gm3R+JU/H0mFRukwg/xU=; b=v7EGGmhYcA6yxdtLguHa7FM1Jh/kplUFLJWbPtS7YVzuBYNcC9pZ2D5IOBilJsHRw7 Qst2hGGz2Byra/9zurDk+QJeYn751KwMo3g25IBRXTapa8ygOJUPch5ZTX7vBtjjlINe b/+jVZYrtKwNAZtrcoo00NzRZRS58faWG1XB11Es+1jV+FVa1fCah8B9DrrJOws/QsAa 6Ew+VJ+uBrH6gMJEEhe31Os5e5XmbKpFRwkvTB+ZCl8zALBg283jmG8ISWx+g4W8Vs+3 gH0hn2ULum5O1Zt/m4r7bnPAOXcuN1NOiFcAe2U6vONz9NG0I5M9QJXjZb4i6V6sbknl XN8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277506; x=1771882306; 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=Z8hcPS7BagBRSt3osrcB1v/gm3R+JU/H0mFRukwg/xU=; b=X9Nx+O/d0WLfPi5GYHSbevPP+YTdzHDGK7ldmWFSh1wKJZyl0L9OBlvKZ7GLwMkNrU KDpzVSEL+EoBnnKZBa3jFOrmmPhbMiVpnhYx9eZWGrOLtazOvB7v9S8fEDPWoVALrN77 8Bw2+XjZCsgi1TS4IGUEu/Q/HoXzXP8H6XuIf+DvuDnYoFfAW3Y1oTNuHndgSptLk7Db Gt7S8IoikuOELk7Ow5rtVE4URY62d72SV/Bzbr+aEVb2IyuG4NI2sH5XKsPLbFk6maKD U7KPukie1P1kyBn/kxo+0418HqU3tk5kP3eL+OzAg113wtQ/lHzJBN69wNJq4+d+w9ea zH7Q== X-Gm-Message-State: AOJu0Yzv1QyizY57C+NGhiGI04p+5DpV1OJhTQDOKMxQFPZk/ENWxSWw qU2vAP8C24xcdS+/EFfKYPxY2NMFLSX/VozYpfoNB8yMA5GwjAQZaAhp2PI/g6UzaUde1hFCw3U wXeFeAas= X-Gm-Gg: AZuq6aIyj8amuWfgmPokI6qVyeCeyrTCx3DI0D7i34ECMniQw2zImdkND+O4lqni3n2 UK2q/xjWgx+Y3WvFSWrbM1e4eZqSdSno0BbSanePVlLaipIQxvaXC9/KVa1Zdry4GLfWkPu51wv hn7VHr66tJDceS4cKvhemkqTkbMHIItJNLSGGRLXul6407d6BE6PTAcM5wSwu86iVnb1cywBLyY Z4ZQYLglcyLsiEsWwCBKtCSnT5EDR7Ne6Gf9EMBE9HatyJlCKteggPrzOyGS68HwvLXlo5ws00J KneG4UWaLhGdEdnlxZryqRmS2ipcQ4p7G3qfbpTtKsVrAkllBvfLVOzNFOJFoIaDNfe8G+N/IWC gS4czwmiDJULw15sRRda+offgvmmVfHqLbei7OyGOSjOlkLSBQoBRSVLpA5D78nS8dZLJ4y9leO 0o0gZl8w1kn3OnuLH5XvH6rabhf04KcTOD59eK6yD3EXbd441/bZwaJB1p5muEqxq6KP0RrvRsY exiHFEFXv4= X-Received: by 2002:a05:600c:a43:b0:480:4ae2:def1 with SMTP id 5b1f17b1804b1-48373a07a59mr192480255e9.13.1771277506110; Mon, 16 Feb 2026 13:31:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/8] hw/m68k/q800: Use MacFbMode fields in q800_machine_init() Date: Mon, 16 Feb 2026 22:31:16 +0100 Message-ID: <20260216213121.47122-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1771277619314154100 Once the Mac Frame Buffer device is realized on the NuBus, its MacFbMode might be different of the global graphic_depth and graphic_width globals. Prefer the device MacFbMode fields to initialize the BootInfo structure. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Mark Cave-Ayland --- hw/m68k/q800.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 4767eb4298f..b55c03a90bf 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -605,9 +605,9 @@ static void q800_machine_init(MachineState *machine) BOOTINFO2(param_ptr, BI_MEMCHUNK, 0, ram_size); BOOTINFO1(param_ptr, BI_MAC_VADDR, VIDEO_BASE + macfb_mode->offset); - BOOTINFO1(param_ptr, BI_MAC_VDEPTH, graphic_depth); + BOOTINFO1(param_ptr, BI_MAC_VDEPTH, macfb_mode->depth); BOOTINFO1(param_ptr, BI_MAC_VDIM, - (graphic_height << 16) | graphic_width); + (graphic_height << 16) | macfb_mode->width); BOOTINFO1(param_ptr, BI_MAC_VROW, macfb_mode->stride); BOOTINFO1(param_ptr, BI_MAC_SCCBASE, SCC_BASE); =20 --=20 2.52.0 From nobody Sun Apr 12 05:51:24 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=1771277592; cv=none; d=zohomail.com; s=zohoarc; b=DFoG2cOh/Qox6hd5aQgyibhhMBZO41ABezCK8p/e1slZZ1081Nvr3XXjNxTSYQ28DCDhIS2qUHsVNwWUBrEvyyoGMB6khjs4x/wDDPrYRelGYefxUlhOepSrdF83M5d3NGbYYQj5y8TWrTSIznWdNqXd0h1//eYcOam5XCalGck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277592; 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=4iTYDTjW8oF01EE5U+uJHraTm442v4OtMz2SMPZaJV0=; b=ZGEEM52vRJ3wqZ4bB0Numtcu6okaB+Oes/BY4S1WZDe9AoJfaooydgMnAUkkR37YZtqpo0P3fSF6ibNilI8ceKKcJepRopqz4cC2pChaD8Z4LK3SS40VgeQ11fqUpfcAYAh35cuR4I8VOr62syAOl71UAx9ZY6UxReId9zdN7ls= 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 1771277592476128.17529929822786; Mon, 16 Feb 2026 13:33:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6Cr-00023D-Gc; Mon, 16 Feb 2026 16:32:37 -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 1vs6CE-0000bh-42 for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:01 -0500 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 1vs6CB-00041p-Bc for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:31:57 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-483770e0b25so30818145e9.0 for ; Mon, 16 Feb 2026 13:31:54 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48371a3f835sm91270965e9.25.2026.02.16.13.31.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:31:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277513; x=1771882313; 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=4iTYDTjW8oF01EE5U+uJHraTm442v4OtMz2SMPZaJV0=; b=NuDFnYm+eVmGOrK4dlTMIP/d3LjUJh8VxOhnhokSVX07Yb/QacVmkEzW3dl0g5KxBn irtFKnMbtXUzkXErA17RQsjRDLsVGZVvjt/WSbHTwAh42OKGgFMRoiEiiN1kecXlvXGY BEmbHmffCzB62t9BFOLp/Y4mEpe+0fBIf8Dm65VU1zS1YVFmzaqjI+LF1iv8jG05tWuI /lCQxsgawTfo7ilGOFI8fvsq8rktMUnH5latOEsX8Zynckvv7BT1Mukeghu+pdEpmexq C2GYHuoSCRBLGkh6XRQOLkyKJ4Gz6PT+GhmZqU8ClEMmBvcWZiGC2RowwTVyJY05XZUj jbJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277513; x=1771882313; 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=4iTYDTjW8oF01EE5U+uJHraTm442v4OtMz2SMPZaJV0=; b=clNSKiJ2vr1YlzpDwtNcip91P4u9mj21ebm7vidWEawpPbim/tdTKNxLT35gdBUN7B uw60tImHkJLD2KjTf0nbmwZwxXdD0EIwxAUMh2Gt8aio/uPR2cI3xNFg9KIbEwTbPkI/ +eELN8AcuyA7wFnGRe7wE3Qjkt43muYxGEkTugBHhv6sZ45ilbNAwqYvMw7ibr0tpBFW kjGn9JblmDI5D6EoDNbIfM3Jib6lxNlVTwEjo7yLqLuS+0I2Tfd9AINKSIQXtw+9cDYH QxLWTFPu0EvFWdcbR8HwshZP+rds9s0iAGh3sXmTuqfMSZsw7LJpdN6JZzcLLWFWMc9d 1PPg== X-Gm-Message-State: AOJu0YxVYjprGmV2ftswLzfrs2zl6Z+ZNItlRZEx1JTbjcTuyjTGOZVZ rL682xnbGFTSvsxR45DwiffcmWI+/xci5ECaqxgS8hrr3vTzKwWZ7ldlRWm+KUbBQniQXe8l1Ru k56ZdMXI= X-Gm-Gg: AZuq6aIr45CTqfqWc+OZrsg7XwwONSWAYTxwUFMLirEDeXKR6mHEhDjKQ4Fwbq7aIQ+ xCfi/rvpq+43crpoxYuLVB/4TG1X8DwtD54xyMxMS/DWwkDcDcojB2Hb6ea6825cdLy8v/yQZCR tRCqgovH/khQDjY/eBYHAodnrNQjQyW4KVtH6zN8Q93IBy3GPC0oElTPqe0OZt5o3ZsE8dHr60R pbwovfJUVEzUFfo5xWXp41dpwlO4/ITZYuXFPg0gr5KU/syVz4I/VxkcBzqUAeDuu6OJAqdRqtY Lsmu8SmHF0dCwQM1nQGOyr/puplt31HvxXLocnEMWIB9Gm/0/OORJClT4iL4f9NWoGAAHkab+xL 8ZXR2TmfVBcLxdF0C2VBuvTa4VohlWCX9XPm/v0WlBth+obhgivHsd3KAK0IBBQX60EA7HH/S7c NgYXVqrK2GRi92CcNEyGzznaVFvU3/VFu6IcH+wDOdBBRokwi7QTq9HQZIRZfnqoCJPtpNWI2o X-Received: by 2002:a05:600c:620d:b0:480:3bba:1cac with SMTP id 5b1f17b1804b1-48371043046mr182491715e9.6.1771277513333; Mon, 16 Feb 2026 13:31:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/8] hw/m68k/q800: Set MACFB_DISPLAY_APPLE_21_COLOR within MacFrameBuffer Date: Mon, 16 Feb 2026 22:31:17 +0100 Message-ID: <20260216213121.47122-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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=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: 1771277594455158500 The MACFB_DISPLAY_APPLE_21_COLOR mode is not specific to the Q800 machine. Check and set it once in the MacFB DeviceRealize handler. No need to explicitly set the MACFB_DISPLAY_VGA mode since this is the default value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Mark Cave-Ayland --- hw/display/macfb.c | 4 ++++ hw/m68k/q800.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 8ef174dc6df..b8115c2be13 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -645,6 +645,10 @@ static bool macfb_common_realize(DeviceState *dev, Mac= fbState *s, Error **errp) { DisplaySurface *surface; =20 + if (s->width =3D=3D 1152 && s->height =3D=3D 870) { + s->type =3D MACFB_DISPLAY_APPLE_21_COLOR; + } + s->mode =3D macfb_find_mode(s->type, s->width, s->height, s->depth); if (!s->mode) { gchar *list; diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index b55c03a90bf..ba32da2fa45 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -563,11 +563,6 @@ static void q800_machine_init(MachineState *machine) qdev_prop_set_uint32(dev, "width", graphic_width); qdev_prop_set_uint32(dev, "height", graphic_height); qdev_prop_set_uint8(dev, "depth", graphic_depth); - if (graphic_width =3D=3D 1152 && graphic_height =3D=3D 870) { - qdev_prop_set_uint8(dev, "display", MACFB_DISPLAY_APPLE_21_COLOR); - } else { - qdev_prop_set_uint8(dev, "display", MACFB_DISPLAY_VGA); - } qdev_realize(dev, BUS(nubus), &error_fatal); =20 macfb_mode =3D (NUBUS_MACFB(dev)->macfb).mode; --=20 2.52.0 From nobody Sun Apr 12 05:51:24 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=1771277593; cv=none; d=zohomail.com; s=zohoarc; b=UJIy//z92HvNKQNEhguYz/IgSS9c4cyxFknCjbfIR+x3nxLPJIDEHgureZrnfQ9MhWce1bhdQd5y8nJ0bWxC6f/+PGHUyhBshx87S+nD/Q8hte+WfigDg+J8mtfuVsAUmwZgLtOCi0k+rgWDXAu5hT2U98qD4tB1BA52/KwHpEM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277593; 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=V8wNVeXGsx4+MMgwpCdoiP3HRol652dz1JzpsDMD+6w=; b=FCsr4OQUT1eHQ16K4VTYaOFOcaqbgW+ItnLH08Ye5NnWtLU0AOFqlzJN4Z1SoD3fKJyTzypfyco2DFlgjDjZRC1iVM2sk6cdN4sQ8kKkRBBN33/e9ueIN89S8WVQjrfX6ft9vd5roHT7TwjNnaxdI3QCWkbqbLgtUno/33kzH+U= 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 1771277593875697.6592206320179; Mon, 16 Feb 2026 13:33:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6Cw-0002nC-R0; Mon, 16 Feb 2026 16:32:42 -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 1vs6CK-0000us-GP for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:07 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vs6CI-00043M-IP for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:04 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-4377174e1ebso2685765f8f.3 for ; Mon, 16 Feb 2026 13:32:02 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796a74704sm31690316f8f.16.2026.02.16.13.31.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:31:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277521; x=1771882321; 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=V8wNVeXGsx4+MMgwpCdoiP3HRol652dz1JzpsDMD+6w=; b=GBmUQg0DARuunz3u1v8BuoPKnU8ffmQ6/sRGf2Y5tqvo/LsLDa5yrVufmqB62Z/Wp3 xjO+3lLR6dH+7hu3SJ+HI4Xc3POk5ZM0s2Eo2GtinL3pc/3SI6ZfrU/y7/IulNDkY3yd i0nervPMEdMnKn1t9d0kQDecgxhlYnGdNGKxC0daxtAKmz7AvReT7fbMGJTrwMA2zsHm c+M2Nw59ED6X/y/mDZ88wvrJP1doMisvpISuW82tQU2Pf8t33r6S9lGLpyBTbmrsoZB2 X/wVXZkaS7c2xCPQ0TnQC/7LlVZVu+LJuipdBOT+mNFCvgsT/qeDQNkaOrfbRU0z7hHS jJLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277521; x=1771882321; 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=V8wNVeXGsx4+MMgwpCdoiP3HRol652dz1JzpsDMD+6w=; b=tgGO3SIt+C0hW7DAZ6X5Widx6gZ0t8y6arQX7Yz9CFNx9eBP82tm96Ps7rOA1m+62j IOqaUxy/P4YfwCcOhZYcCHVGBSWfk9VHMwj8OHQHI5i1DilPQe5IPHCixrItL2SbjGiX 2JX7d9t6vpdWnySvZKnJcayIKMEJK0n9JjJuOdzAgM6Rc4w4Mmkjc6B6GHoshkm6JtZA yO5N8xc4nOqLCMqavWg73cnwT5Pz7SxPLe0FIXQ1FwacjNODGBkWBhJjLT/MYPuanrRY +hB4/ihugCLTaj5lJ2MbQm7DmC3gIXVY712gmYj2A/Sy2wGDwb7VAul6k8lot20fKn5L Ppcw== X-Gm-Message-State: AOJu0YxCcrN/uYAX89s99I49WCJNl/sdKr3shHkdswYXT6W2RD9UeAoQ 9kMqkDf1HdHyCchSHFb9/FZ6FkeQO6+K78DDqpVe+I1knxnTrJScNosnnVbTfq5LTVgGJ67EE5s p7rrFivQ= X-Gm-Gg: AZuq6aIQXl66Ux+p2UbgLjonhXQIi3Ai27hMBxdH2q4dc4I5qO5f5tQulYFoL2U/SqU K6QSzwQhfi8J/HXh3iOgMvl+LMNKUNeK+KTXV7OtvLORxlxwiXHBU8VdjSAU9LHPzmIefi4GoQU 6cVFt9OHSoeZgZjK4PD6Q7WuVqTZW7zz3Hkx6L2WkS2A9c2ubq+x+4jxz+FvKDca8KqPo+Xr94P icjU4pFZ21Z1uf5LwbPx1NXc4nnj3kNAARjLcuFwWpXDiG8NvXbWk/6PB8VR1342kX7t9qAufs6 iMrPWwm2xcf50f+oC8YB3e8LTo8ZojDMlxnQ4CPhhcbUR0VKE4mR0AvbaIwi7QI+vD7wrxNn4Dy dnXvi9bBsql/O+I1QSMYa0jLft1i67hlem36RKcKUIhFVS8l7rWCk7mOHi375wJzdOrM6rBgx47 0e1vt+NMdPnmzIvFnyP3zFW7EBo6zPsNi6XZkaiKoKx4ec+z5qOTCnCf3YpaSceELICnj39UIpY 3zLtHKOLIM= X-Received: by 2002:a05:6000:1843:b0:435:e3bd:5838 with SMTP id ffacd0b85a97d-437978dd2fcmr20770738f8f.25.1771277520693; Mon, 16 Feb 2026 13:32:00 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/8] hw/m68k: Set graphic display dimensions generically Date: Mon, 16 Feb 2026 22:31:18 +0100 Message-ID: <20260216213121.47122-6-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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: 1771277595028154100 If a dimension is not set, have the machine init code (q800_machine_init) set the default values. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Mark Cave-Ayland --- hw/m68k/q800.c | 6 +++--- system/globals-target.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index ba32da2fa45..ded531394e6 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -560,9 +560,9 @@ static void q800_machine_init(MachineState *machine) TYPE_NUBUS_MACFB); dev =3D DEVICE(&m->macfb); qdev_prop_set_uint32(dev, "slot", 9); - qdev_prop_set_uint32(dev, "width", graphic_width); - qdev_prop_set_uint32(dev, "height", graphic_height); - qdev_prop_set_uint8(dev, "depth", graphic_depth); + qdev_prop_set_uint32(dev, "width", graphic_width ?: 800); + qdev_prop_set_uint32(dev, "height", graphic_height ?: 600); + qdev_prop_set_uint8(dev, "depth", graphic_depth ?: 8); qdev_realize(dev, BUS(nubus), &error_fatal); =20 macfb_mode =3D (NUBUS_MACFB(dev)->macfb).mode; diff --git a/system/globals-target.c b/system/globals-target.c index 989720591e7..e3f7d846ac0 100644 --- a/system/globals-target.c +++ b/system/globals-target.c @@ -14,9 +14,9 @@ int graphic_width =3D 1024; int graphic_height =3D 768; int graphic_depth =3D 8; #elif defined(TARGET_M68K) -int graphic_width =3D 800; -int graphic_height =3D 600; -int graphic_depth =3D 8; +int graphic_width; +int graphic_height; +int graphic_depth; #else int graphic_width =3D 800; int graphic_height =3D 600; --=20 2.52.0 From nobody Sun Apr 12 05:51:24 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=1771277563; cv=none; d=zohomail.com; s=zohoarc; b=G7WCJ3DRDmUiazNDWOme9ExWS9NrEq7DpqGjVrSL7wAyyfDAmyINeo7FXiTeEg/we7lL3deSHhlJT4/Z79Hg2+mR3daznNqBresnGRpp/M65imxbGzkd7Po7KkKIQcRBAdPWGgqhA4lCIPUR4CFCRG1QFnelHXWL8ZcGtlHxTP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277563; 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=pMtVGcZy0xyurJAQ1/i7z0i0Ln6l5I0t8FfNIVKbubI=; b=PE8fFu+5kQlVUnrCmB723dLIDT4uGQ7ZEudE+QxaYwpc3fkaif/PZ0CTgzBnbxaF47Izii+sZHyPIhbgkORtrmouYCJpqGn4rxuFtDQ7Bq1iawASs4468y3czVkQ3XXJZIxbhp2OtxmzXdbuXhZi3gt66O+7kSwHYTpmaC3ggeM= 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 1771277563783830.3738438347473; Mon, 16 Feb 2026 13:32:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6Cs-0002GH-UM; Mon, 16 Feb 2026 16:32:39 -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 1vs6CR-00016f-SG for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:24 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vs6CQ-00044P-9L for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:11 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48378136adcso18390125e9.1 for ; Mon, 16 Feb 2026 13:32:09 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48371a3f835sm91275755e9.25.2026.02.16.13.32.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:32:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277528; x=1771882328; 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=pMtVGcZy0xyurJAQ1/i7z0i0Ln6l5I0t8FfNIVKbubI=; b=utzVSv5s5IquZl2aUXN35VMXZ930vmTL4geek7Lmj/QudWiyMpOc0/nVOqscWM6GCa MNgePc7XrjgNqS2iVKiKy3BornpJHwXwCyO0YA4SpQ6ur6zgB55W5qmmW8VnDsqnlYHj hWFP7FksyvDxPRMlxAXAiOCu7lAVMRPqeCIGelImkG7r8q9p2r1Oc4DILz+N7E1qP2c4 F9Dcl7g9DwnY/rg1GMplOlT4+B6fULr1QlaPROahm3Lbzsk4netq7mgQXNYWqZl0aa3W HSJtkn9H9E9R35MuU/ILfdXzdluZB343y6ZDXdaew2uwV9uzxS3PVyBMT8r8Mn3VR9tN gkgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277528; x=1771882328; 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=pMtVGcZy0xyurJAQ1/i7z0i0Ln6l5I0t8FfNIVKbubI=; b=gXg0pbW/nd6F6mHbzRgFMRHiQvnmJcpKvZNi10O1ElhUnlldGf5EodB1AYn6dzE5OJ DholMtUI6LOmaO/oMeLby2ZGuugulkdJfMq4U2XUU7GQtIVAqM7Y5zsjKZoyi1J/g4hy pObAfK8CTNxVeZlbqISVGz7gJJKER3/4poypCl/Z1jo2dFT070/nW3aXVGE+YOE0mdz9 k7fjBJeMnsOi/4IAEBZ17UbTjxKzN4MKvY59GF9axv5txyXGcm/KKrMDj18/2Ycw8JOF 812MAAmLWMrUGQsYsmG68fr3R48lZrwXMcmX+PEU5+z/SzB/FkQlP9AFP5U/+Klju89B n0jw== X-Gm-Message-State: AOJu0YwMetkwLHIBljvaHae2PYRW6XJ48j4OgrKLnfVXpceOp7JSp/3R GUr+WfmBFSK68t8MoiBaabOLqBn7qB2Ab9qdlqVYRCf18s6Mue6OcMl2MjRzltD64BRwWsB5kgA xWXlPlnQ= X-Gm-Gg: AZuq6aK2Duf0AUv5hPmeYKcJZ2KcJHIDBB9GwsXG/tFAsy2p9imObxgQqA8Nwh8zrG4 s/K9JbTVWEj+nnGASPdH7x0Pzg8wLOukyAVLZjiBNvAXfqtCye0j230CJHBGpQgpR+h95rsSKBe zvH62Eqe5iOBtRRq3gZQxA6nJROqNlxNLUu3csy0PZjAfETQn4m6vHGWFdwsvUb8WI6YuMPKz0c EuSNPPwfrX5vAKdwgG73HkLix/X0+a+j2IJHwtzkQqId7IyVDTFtGzQkoS6f7w8cgngd9RuTmYL hdDSSKcAxPtswqA8KT3Ts00RupItIrknah/uJb/A7ojmuMZu0QjOqi1ZSSzveE3TO2ie6z6mPbV GHVCuty2P4MKb/pMHuypam+3JM2x44o8Kay+xQKWeLapQ8sHjjDtR33FttSngjDgqPnxGH4mNzJ AXu0httm242X3BvCUjBarHYF0gzH7gVDMuvWOsi5tKCQuE7QoiWAJrpO9eeoCFZu7HgWv8hlNY X-Received: by 2002:a05:600c:3e06:b0:482:e5d4:b7ca with SMTP id 5b1f17b1804b1-48379bac81dmr147236465e9.8.1771277528002; Mon, 16 Feb 2026 13:32:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/8] hw/sparc: Set graphic display dimensions generically Date: Mon, 16 Feb 2026 22:31:19 +0100 Message-ID: <20260216213121.47122-7-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1771277566472154100 If a dimension is not set, have the machine init code set the default values. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Mark Cave-Ayland --- hw/sparc/sun4m.c | 9 +++++++++ hw/sparc64/sun4u.c | 10 ++++++++++ system/globals-target.c | 6 +----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 0c0d658d301..a17bdb36927 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -892,6 +892,15 @@ static void sun4m_hw_init(MachineState *machine) hwdef->esp_base, slavio_irq[18], hwdef->le_base, slavio_irq[16], &hostid); =20 + if (!graphic_width) { + graphic_width =3D 1024; + } + if (!graphic_height) { + graphic_height =3D 768; + } + if (!graphic_depth) { + graphic_depth =3D 8; + } if (graphic_depth !=3D 8 && graphic_depth !=3D 24) { error_report("Unsupported depth: %d", graphic_depth); exit (1); diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 5d7787fc1a5..b8bda1eb816 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -666,6 +666,16 @@ static void sun4uv_init(MemoryRegion *address_space_me= m, sysbus_mmio_get_region(s, 0)); nvram =3D NVRAM(dev); =20 + if (!graphic_width) { + graphic_width =3D 1024; + } + if (!graphic_height) { + graphic_height =3D 768; + } + if (!graphic_depth) { + graphic_depth =3D 8; + } + initrd_size =3D 0; initrd_addr =3D 0; kernel_size =3D sun4u_load_kernel(machine->kernel_filename, diff --git a/system/globals-target.c b/system/globals-target.c index e3f7d846ac0..17a27a06218 100644 --- a/system/globals-target.c +++ b/system/globals-target.c @@ -9,11 +9,7 @@ #include "qemu/osdep.h" #include "system/system.h" =20 -#ifdef TARGET_SPARC -int graphic_width =3D 1024; -int graphic_height =3D 768; -int graphic_depth =3D 8; -#elif defined(TARGET_M68K) +#if defined(TARGET_SPARC) || defined(TARGET_M68K) int graphic_width; int graphic_height; int graphic_depth; --=20 2.52.0 From nobody Sun Apr 12 05:51:24 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=1771277573; cv=none; d=zohomail.com; s=zohoarc; b=nFNhy4CHBV4wI0ja0H5phDwyVf/ekmkLHUmkwHQnb1hRuUntQGPBzzdKjFBaNKi6NEWL/IyoFiIs2uCJxRj30M+lc9WZaUovX940+UdyUvBLR8p5g1d5gJaxGTlmEwjJe/jdbRofzD8hhpaJfyECO+vJR3n3KG0G+RuHTxODL/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277573; 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=D+jMqivfnrcdUY1u8zHXwV1uu1QqH0rdk08fo1hOV0E=; b=Uj1zq7ykNVEudheCBDD/a63CGsGIwngQdskCyGslBHUCJ6LcTPtQCsNWoL0+FQTUeICgfU3WltcsWw0pX1KrO187fWyGWmjg0IpSmngrjQsXGh7gOZyKH7mDNhrqFAZHQ/yysWC0DdWnOPWyh5gw+jBfjXC20UWnc9FNKrW0B+U= 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 1771277573281712.5221357458133; Mon, 16 Feb 2026 13:32:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6Cs-0002Ec-LS; Mon, 16 Feb 2026 16:32:38 -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 1vs6Ca-00017Q-IX for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:24 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vs6CW-00044r-V1 for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:18 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-483770e0b25so30819835e9.0 for ; Mon, 16 Feb 2026 13:32:16 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48371a4b63dsm95104645e9.32.2026.02.16.13.32.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:32:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277535; x=1771882335; 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=D+jMqivfnrcdUY1u8zHXwV1uu1QqH0rdk08fo1hOV0E=; b=pYOlXz/j7drTllQ9M6RbYVBWAt1MnxN2+npoJCGKlNPOUG36dxcfxSvoC6qhCbsHlj JXKoqN8aOWKfw2jtbM3l6Rc5Py8WvFXEefP8DMgLACmFJ8VE+vlmm7zcPglGvMIcUVgd rVY7T3OXvVv4QiNi4uGKwwZEsBkCvfF00jmWF7QExM1SHjypEnwIsRnQB2C1nzcswJtO a11l/0kqyFFfHQzUBhLBA9WEkF05RInNAB2JdYUWmvnRsT9bus9c/CgoIVPStiEFiHlt FZXFYw6+c3Za4Ms2ffsGJoZr3fmDKQjA8WXj7fq2sPT8j6oolchgsmKNFHElVUCf8xDi ttsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277535; x=1771882335; 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=D+jMqivfnrcdUY1u8zHXwV1uu1QqH0rdk08fo1hOV0E=; b=ei3HxonPsdK3ZW2X9L374acPxwDRgdzMuvdqBUYCjUntHW4SKb2X0vIZQWH+TLSSP9 i3lfAOWfCWe0+LfpI868XTc2Q8Zeg+lTxUm5vN2/BsowpA2Ab3IJm91AQaIcv37KHc5y k21JtuOphfxw/gc/0Mz++Rh/L7Ax7K7ZHvHgE9h2nf6BSlk3xkn3B+lwGn233t/WRLGy 9BkIety7bhsqMTHk3S+t8ZCOSM4ZFORMGEYDF8Vm/QtYn1MZf55a/e7BtgoGEB5ehOhE 9XIznxL4A5EI2Xn8QGrwmc2lQq3ZYnSKsfyU7aFMUHJYB5RCL0qVEJp7ostTl3xqa/S+ 1I2g== X-Gm-Message-State: AOJu0YyJjigwn7PFoOZ19RipwvhQ1wNf3Kvb/eIw1d+Yd1sYmnG+SgNl 3A1c21L4JxaGBhigJb1gQugxov28xMWgipjrbKjFvXZJYOLPkZ6DQfIA4xXYeLgeMn2NJKGQ5ZL titfc+Lg= X-Gm-Gg: AZuq6aI+X04MUWhKrA8x4W7wh1rNB4R2nUn6rBI0SBsIwUDNPD0QNBSgEWuXoDwh1Kn bJacn3yJQAuHb5xXH99T9EeO05r/Mq4zIxBJKTZWmVK+3uiZSiokiThF6LFXuGhF0ZW4f/FtJKD ycgbpkEklwdD7dHnfParjUfJaNj52XwcfhTnW3pd9hQ1IgQ8lSsAzOLGB2l5SMz0++0BMzNSmfk IPcIbt5loVhvVzPebqz6q1K6h8NzUNJuxyJZoLe0YvkhE+bkQYKKpPz2PscCBCH2iOHWpE7LiYG e5AlkI63hKWrsXDj0ZWea3eDgGe8XobcWsGt29IwCn2/pXhk+aICEtg0sTL+DKuROgqkDal3u2Z QtyGuzc7YJiu6ZvShaO39gDrOO3/exCJZPGxYAqscd5lC6o493ZLr32davQnEDjN76cW7DNnTXc HOYMqjWjap03D/KUq7s5g83IVCvmpgqiwKk9kFREVksQjL+BzAKwPzVI259gQ1qb0pDaPZXzLe X-Received: by 2002:a05:600c:6912:b0:483:456a:5146 with SMTP id 5b1f17b1804b1-4837108fed4mr208785135e9.25.1771277535103; Mon, 16 Feb 2026 13:32:15 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 7/8] hw/ppc: Set graphic display dimensions generically Date: Mon, 16 Feb 2026 22:31:20 +0100 Message-ID: <20260216213121.47122-8-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1771277574703154100 If a dimension is not set, have the machine init code set the default values. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/ppc/mac_newworld.c | 9 +++++++++ hw/ppc/mac_oldworld.c | 9 +++++++++ hw/ppc/prep.c | 9 +++++++++ hw/ppc/spapr.c | 9 +++++++++ system/globals-target.c | 6 ------ 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 7275563a155..3680d96ed39 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -432,6 +432,15 @@ static void ppc_core99_init(MachineState *machine) =20 pci_vga_init(pci_bus); =20 + if (!graphic_width) { + graphic_width =3D 800; + } + if (!graphic_height) { + graphic_height =3D 600; + } + if (!graphic_depth) { + graphic_depth =3D 32; + } if (graphic_depth !=3D 15 && graphic_depth !=3D 32 && graphic_depth != =3D 8) { graphic_depth =3D 15; } diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index e679d338985..24d9f2e3d5c 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -288,6 +288,15 @@ static void ppc_heathrow_init(MachineState *machine) pci_create_simple(pci_bus, -1, "pci-ohci"); } =20 + if (!graphic_width) { + graphic_width =3D 800; + } + if (!graphic_height) { + graphic_height =3D 600; + } + if (!graphic_depth) { + graphic_depth =3D 32; + } if (graphic_depth !=3D 15 && graphic_depth !=3D 32 && graphic_depth != =3D 8) { graphic_depth =3D 15; } diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index c4efd1d3908..e973b340992 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -412,6 +412,15 @@ static void ibm_40p_init(MachineState *machine) fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)machine->ram_size); fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, ARCH_PREP); =20 + if (!graphic_width) { + graphic_width =3D 800; + } + if (!graphic_height) { + graphic_height =3D 600; + } + if (!graphic_depth) { + graphic_depth =3D 32; + } fw_cfg_add_i16(fw_cfg, FW_CFG_PPC_WIDTH, graphic_width); fw_cfg_add_i16(fw_cfg, FW_CFG_PPC_HEIGHT, graphic_height); fw_cfg_add_i16(fw_cfg, FW_CFG_PPC_DEPTH, graphic_depth); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 274f38785f2..0ab39dfea6b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1177,6 +1177,15 @@ static void spapr_dt_chosen(SpaprMachineState *spapr= , void *fdt, bool reset) if (machine->boot_config.has_menu && machine->boot_config.menu) { _FDT((fdt_setprop_cell(fdt, chosen, "qemu,boot-menu", true))); } + if (!graphic_width) { + graphic_width =3D 800; + } + if (!graphic_height) { + graphic_height =3D 600; + } + if (!graphic_depth) { + graphic_depth =3D 32; + } _FDT(fdt_setprop_cell(fdt, chosen, "qemu,graphic-width", graphic_w= idth)); _FDT(fdt_setprop_cell(fdt, chosen, "qemu,graphic-height", graphic_= height)); _FDT(fdt_setprop_cell(fdt, chosen, "qemu,graphic-depth", graphic_d= epth)); diff --git a/system/globals-target.c b/system/globals-target.c index 17a27a06218..ffa6c308b59 100644 --- a/system/globals-target.c +++ b/system/globals-target.c @@ -9,12 +9,6 @@ #include "qemu/osdep.h" #include "system/system.h" =20 -#if defined(TARGET_SPARC) || defined(TARGET_M68K) int graphic_width; int graphic_height; int graphic_depth; -#else -int graphic_width =3D 800; -int graphic_height =3D 600; -int graphic_depth =3D 32; -#endif --=20 2.52.0 From nobody Sun Apr 12 05:51:24 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=1771277567; cv=none; d=zohomail.com; s=zohoarc; b=Lse0WztW3+qoxxQAPyOwz91NS+CxlHyLnlDB0fT6jJQssEOOc+tDuEIgo49YVkpdK2zK5+J5dQbDH9OIcsoHCGggYG1nT2HhkILRMLT/yZ9A2CcbYUc4OdyyJ/N3WnWgThN94Y5qXqCItl0Hd9NELM2uE+ged0HMYO6WhudzU24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771277567; 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=KmeaTgRcbtYXQZQ0cj05tFFPuUc/ARqWElo1Z0I+CbU=; b=OR31eOo5Hy0ZJfKY3R/cwXtjqiVreHUCZkimiPoiAZ8y+UrSdt7fDfQ/NMk5SfAqBXygfpTCPEYdnS9EbFdM+oSTYYAt/oajKo9FQSPexzidF89B+M/uP57zHfVFbD/uKDjtvTseWQPzRTRhCOHEGZuSS5jec8A4wZHB2vH4h5E= 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 1771277567916849.6085876877585; Mon, 16 Feb 2026 13:32:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vs6Cv-0002gv-NW; Mon, 16 Feb 2026 16:32:41 -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 1vs6Cg-0001D3-7u for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:31 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vs6Ce-00045M-LN for qemu-devel@nongnu.org; Mon, 16 Feb 2026 16:32:25 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48068127f00so38220145e9.3 for ; Mon, 16 Feb 2026 13:32:23 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4835dd0e327sm457917305e9.14.2026.02.16.13.32.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 16 Feb 2026 13:32:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771277542; x=1771882342; 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=KmeaTgRcbtYXQZQ0cj05tFFPuUc/ARqWElo1Z0I+CbU=; b=NwwyBEwA0pJ8wtCJs45UKzlXPLuFQt33YFPsgu+wcv5wdtcJ5TKyJ2ASzZ3W5UiOWR +KzyyS0ozP8m8MsmaDucGQWR2aRQ8i6GrOjggQRE/fPVR45KYXs4n6xx0JcAgRR84dPx 23lQ7SdI4LgwxaonXx9/9CfckJWdOu07xIXVbjslnBZwHRlzsDo92XVryGQkxVntdBkI 9nwNjvmSyB3A5+CmuzwMATy/lpGukccHUoHtKAp0/7ZFpcCjS++cWDa0w7AwKWS/bWSi tnet6BtUxkyCArBem3ckJG+EvF7zA39NgKmH2+ea+Ho6nUzninw0989J/3VNP3LvNXoW pnDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771277542; x=1771882342; 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=KmeaTgRcbtYXQZQ0cj05tFFPuUc/ARqWElo1Z0I+CbU=; b=NRsb4xKh/rsUTgwBYm8uunUV+dtdYkVdwXczr2AA3hT7hKJS6zRAqov1sNvDuKN0XV 56rNA0EYwGsKTd8Nn+6wbDnqHyetm53FpvD26KJ5aFWT1jZJOjfZWbOmpoqSMI3JpJYZ ZzrJRhIJ9QGuxheJeXV4vfKrSna+kxA4pn5W69i9vwM5cxeOs/k/ZNXcBTN02G/2xwM2 ZPMKGZJB++0ddZU/cWJ0L47/RkKbeDzTUjVQA+LSKAI0DMaTHHjQGRJ4Bgxb9kXcDkpY EPWUimpMjnZkkMShL0iVmF8cEwOpcCD4lHsF9BhIRBb8GKCilA0TktdPn7yluLbujZc0 kPRQ== X-Gm-Message-State: AOJu0YzE8BROovw/gsAkN0tPHmi7So1QNIsuj3AAtD6jkgcwfex2LTlu WfABFBcds2N9JfjhiMqAJ3WuAP1plKYlE4/6UGkp3/sUGHGeLOQyKZTpOhLWdKNEQp07vqFOJQ9 eKLECzJc= X-Gm-Gg: AZuq6aKapK0EAGl17Dc5SC037xQNnG6dnyKwxMjWdkatIMaeagPId2aW5F7ej3/mkkT JlBIjHcifEsxklklXltwnNYFACslxN24Odv2VkoVZbkplQDSsm6X3JY1CJkhEvAxm2yPq9C4ONr /OoXFpD/DrIX3fwrmG5RM2IPNDH1dS7Fd3BLLt79yovUpeXvKtPHePjhA4/hwYvXc7JaHvEy5Uf j9g0YlOnRs/lrLAGdmU48oTsRoThRxDF69/U3eRdYNDy75/jpM58yW8ccyacbFn/SRLwjaxgxnn GpPM0/Rz6+zdC/6d0a6cMysdgDP9iTSzK0fdqkaDSMjhgiTqXe5+NXb8xrsK4TPLJtL6Ujdx5Uu y3hRAF23jTRcDv47l2CK3g2gE3wikOXktBfoCJ/t4ynK+Hf+g2KS1DPzmOk54O/ozNsQq8OuvRE EYgv593VtYKl3bdNcy/IDI2vTN2m8vOGJLNrCfa+DycS9CTOWiltfmeQZYaWBiaTv+RAsS+/Gm X-Received: by 2002:a05:600c:1d89:b0:477:5b0a:e616 with SMTP id 5b1f17b1804b1-48373a085c8mr213514305e9.5.1771277542204; Mon, 16 Feb 2026 13:32:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Chinmay Rath , Artyom Tarasenko , Pierrick Bouvier , Laurent Vivier , qemu-ppc@nongnu.org, Harsh Prateek Bora , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 8/8] system/globals: Build as common code Date: Mon, 16 Feb 2026 22:31:21 +0100 Message-ID: <20260216213121.47122-9-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260216213121.47122-1-philmd@linaro.org> References: <20260216213121.47122-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1771277568526158500 Now that all targets have the graphic dimension variables initialized the same way, we can move them to the common file unit, having them built once. Remove the now empty globals-target.c file. The command line '-g WxH[xD]' option is not changed and behaves the same. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- system/globals-target.c | 14 -------------- system/globals.c | 3 +++ system/meson.build | 4 ---- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 system/globals-target.c diff --git a/system/globals-target.c b/system/globals-target.c deleted file mode 100644 index ffa6c308b59..00000000000 --- a/system/globals-target.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Global variables that should not exist (target specific) - * - * Copyright (c) 2003-2008 Fabrice Bellard - * - * SPDX-License-Identifier: MIT - */ - -#include "qemu/osdep.h" -#include "system/system.h" - -int graphic_width; -int graphic_height; -int graphic_depth; diff --git a/system/globals.c b/system/globals.c index c33f6ed3902..34fd3ce9c72 100644 --- a/system/globals.c +++ b/system/globals.c @@ -49,6 +49,9 @@ bool enable_cpu_pm; int autostart =3D 1; int vga_interface_type =3D VGA_NONE; bool vga_interface_created; +int graphic_width; +int graphic_height; +int graphic_depth; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; QEMUOptionRom option_rom[MAX_OPTION_ROMS]; int nb_option_roms; diff --git a/system/meson.build b/system/meson.build index d91703d3dcc..579e8353d53 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,7 +1,3 @@ -specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( - 'globals-target.c', -)]) - system_ss.add(files( 'vl.c', ), sdl, libpmem, libdaxctl) --=20 2.52.0