From nobody Sun Apr 12 04:22:07 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=1771035236; cv=none; d=zohomail.com; s=zohoarc; b=ByhKtubIf2FVsMZL4mPi9qMwi0jlECSDesRwfSFiCpA529gmUZyXl6V9YUE7BS06SGY/JlbfCLFmYLQJQ7Z/aCOH6tgh9Pj4F89eEpE/xSK68SqAcyVQnZkboFfZPsORuSkVEj2cRR9EPxRsBBSUNoQBD9fnn5oadz/5rIJyHD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771035236; 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=UW54D3jaK4/hOnhFU88FxBB/FWP9ogaH9ApScZzAiAU=; b=OFw+cC3m5vWGGBt8+gTaktk3Ifi8i1poylRUKtDnosaKDAlzh+XIVQLqmn5s6hpOxAlS1DsLkeer/bIM8CMH+CvRrW/uNXy4Ot4ZZD2pJMA+j/XEHTvWa0l/hkGt9+/TNVyfkvmdv0lIFGWEl64ZmWj8XQmODzeCw0ZwmHHvGEo= 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 177103523628154.343966624990685; Fri, 13 Feb 2026 18:13:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vr59U-0003dK-2v; Fri, 13 Feb 2026 21:12: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 1vr59R-0003bN-Pf for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:12:53 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vr59Q-0004Vd-9r for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:12:53 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-4359228b7c6so1045999f8f.2 for ; Fri, 13 Feb 2026 18:12:51 -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-43796abc8b1sm9981348f8f.23.2026.02.13.18.12.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Feb 2026 18:12:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771035170; x=1771639970; 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=UW54D3jaK4/hOnhFU88FxBB/FWP9ogaH9ApScZzAiAU=; b=Ig0PCF4uSz+14+C5YHx7ambnsPAt42wI9f9ergufYPT+gdaU5DwNWXt6W8kYd4M5bH M+o7sn5ClZCFeV3MNTvQNm/EHuauf+7SQk26sAI8FT+KjXF/CLUn1IrhIfugQLZvadaD GTloQIyr2t7dIMncFG3EvDQ14M3VWYvO/DZQOBB8WVMg+bAsHnpPh/cuqxh4u7ytKON3 M3XgMb0FcPGTeflqfw3msXcDu8r852JrUoMbRErLkcV24LR83WMh2NE4s2y2HpkCHhU8 XARqOt4mA+mwm8ppH1xellVhHC4HEnXulXVZiYNxmN2mV8JEgwgDCne27SW/kVD4qi3s 8pgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771035170; x=1771639970; 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=UW54D3jaK4/hOnhFU88FxBB/FWP9ogaH9ApScZzAiAU=; b=HzLrPdiZAdb6ITeBj81GF+RTT7wiY0CB1WzesoTgYmtWDn5NW66bTUite1ZRY0IhWG pLn/XHzZeaKOK3oJJ8u0H1r41Ztha7Tr40zz7wJ6XslOEk9q356p4u7wcJtggR0UCCbn oAp34HSjQlYVqi9uEXtS4/Pu3IJ0HbydaEQygYplT9hYJ23KwikJstf+sKSF8pHx9roT WW+xjdGZ0+wXhLJO3nsG5yOe1Zjw3dPpn1jSvd/AuomxtDz1x5blRq8ezZFXZNhpy54i xAi0DC4SaA83dGZZmsaLVNvp/euEaNkUasY0+TLJldwt83er3Jh1MLS0zYXOJ+p3Bv+3 8LiA== X-Gm-Message-State: AOJu0YzCQDUY6JFuxWW+bLwFn00DB3CBfPdtYVat2babDhwqsrh8/K5F tJIgo80qFUrw2dZcrAufP4LxWLHrUGIJiZ4aHz0PqxCLT02EYftnLjmkCcEt+PbmS+A5nQOxwav CdABvkG0= X-Gm-Gg: AZuq6aLHisCaa45OdrRFCL9V3mfGnruMYuepO+FKiFN0/MpkgfDipIMYyzVXZ4o4ZnP T6g3zK8D5Y6/83UJeNoG/theFGw9TlTbb/1WQkCIbNKY85SI2C441B6dDtFBqhi/91yALnVwIF2 rplQ1meVE+PPpcXk1STivZHoQu/NolqpSmMJkNXbVqHVqHF9VRZs5bLgKQrgVTd74D+CYcNWXfa OqwwigomCGD8UfA+wqwvTo+7/R+cqVov0lFCdDh9qWzkUClhg47McVcE4S2NoyHfFhruSxqMj2o s2IBt3JlD9ULpekYhniod10w7DRtE5XPi5QU6EaszLb294+oMCyZ6TW/MNnFmFkIXU0SyhA8pbd 8fhMob+uazKR4IHQ/tRkBCfeYerTHdxMwS+C5swuexwjGoCiZTPP/N/iuosdmW2p/qzyHrf0ist 9BwnsTxBzL6dNNxDFo2CRBUYG4LIqLOO4GeUVRNMVop/ZXHuPXSPGfjUj3TazmTbarDxofCnvtJ 2vfps2HxbY= X-Received: by 2002:a05:6000:2dc6:b0:436:145a:e54f with SMTP id ffacd0b85a97d-4379db66af5mr2632969f8f.24.1771035170355; Fri, 13 Feb 2026 18:12:50 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , Nicholas Piggin , Artyom Tarasenko , Pierrick Bouvier , qemu-ppc@nongnu.org, Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/8] hw/display/macfb: Constify macfb_sense_table[] array Date: Sat, 14 Feb 2026 03:12:32 +0100 Message-ID: <20260214021240.58657-2-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214021240.58657-1-philmd@linaro.org> References: <20260214021240.58657-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::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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: 1771035239016154100 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: Mark Cave-Ayland Reviewed-by: Pierrick Bouvier --- 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 04:22:07 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=1771035236; cv=none; d=zohomail.com; s=zohoarc; b=Yiqr89XLf0FrwVVPebef5CRlSIDttKvtn6zwWcd8sVCZWzVI+K+S12+uDEZ88CNXiJQ0CFEXMaFeSF+98wBGFIxRRwohVO+r/cgysrzOsVNeifQS/cPScUU8wz6J3yGi/4bz07qlIdC0JZmo5/jaPHreQAg90zD1Yq7csHZyxYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771035236; 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=nmUxv3UTE6ZdlIHSSW1HHJoRu03dAklDGcxZsp/sqZ4=; b=M3HWHKVleYWu2+fWChOxQC+Lt4rKld6V3WtyAY9akHXbKbw+taDgho22rkuhJZPVxTIRNZqgtOdCkd3XZ6PlJQep/PkPyEmoH+Q8PhUg77oSHdAxauQYc400FNpDmh8q14rBZDKf57f1+M/PkCs0b70aI9cJdY+/J1Z3BxGzZvE= 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 1771035235953446.59907740116114; Fri, 13 Feb 2026 18:13:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vr59c-0003eq-46; Fri, 13 Feb 2026 21:13:04 -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 1vr59Z-0003eB-Ul for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:01 -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 1vr59Y-0004WH-H8 for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:01 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4836f363d0dso12335825e9.3 for ; Fri, 13 Feb 2026 18:13:00 -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-4834d482480sm328085395e9.0.2026.02.13.18.12.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Feb 2026 18:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771035178; x=1771639978; 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=nmUxv3UTE6ZdlIHSSW1HHJoRu03dAklDGcxZsp/sqZ4=; b=sCDmB2ZtC83l38Z/GIYPm6uldV+ni2oCbixbye9fC/oiGTDhsN2CEQ4UDl2YI82X36 m7nI9kaFEzz7ZhhSoEyE9+CPBdqBzEvci7d/o+Y9NLf82mLOUaHNxQsArG9NUvQld5YO TpMWiQUomEqt7N4AkvdV+ZqEB87M2vM2G0DpvzjMb/Nu9jXPj1PNCg0Sf16ZBjCSbsnA lIW7GL1Lh6dUHShgAaLy/qd4rSsNo+tDmtrFjQVA0idBKP/1otKi0rnagkTr020kHGh3 oKORZyG5r2ewEs/ZASCKnBr99qefyU+FjMYkQYrZmoiVIlo/QEhlzGWtTXd2FRkWo1RZ NM1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771035178; x=1771639978; 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=nmUxv3UTE6ZdlIHSSW1HHJoRu03dAklDGcxZsp/sqZ4=; b=Hce3cCYhws1yzZk1yO5vIkJccGQsEI/kZ+Nt0Al2EtAOqHcqXAZ9Lp5crjUBWOFDTr dD6tbbVc5rZv1m6HBgCrJIeXrFYJofgrGJ8DqsYG/L0l6qzBQJy2hifdDKj5s7nNguSk D8+CYUQ8tkCZQM2UXINnQdhNvHVn5epLzGsZnFASesSnEd4dT+APeQmzedXcM7GucHD/ bx2X4kG7yncL/xr8z1FrWYoonTNhp6tDD725IenX2FUBscZxE0EwSKZvAg1Tp8GuoVlx yvdpuCkkkAQ3Fj1kFDttLUWyEQZhT8+O08Y+E9Oe+686pPN0LPXAJMJPHlOEzef5GIyF 2Gng== X-Gm-Message-State: AOJu0YwGdruQSXoIqc13Q47qTsdpinQXc7lA9gV1yfe5M4Uw7v+16Vbm SrChAeimM0yrYypHizi3WFVXLfOv5STllXydR8KlT/5v43uZ23tjUw+fPuDbLLcA01nAQXv0YvA aWMhGgtk= X-Gm-Gg: AZuq6aJDZfEhmUEGJgxrSxLdZxvaLoChWi6CLd2J2EYyeWlTRSYyAuUT7eYWXnLacN+ T0dcGTPCvdjPVN2pDLrvXZnfFMoymUQURu9pHaS7gdVepaFt9JujdcjQAo9U+k3FH4n8pI4hpQ4 1X7Ya5zlwpxVw0I/Jmd+0btj1ouKXIQDN4nfxVnlPK/+xCCSrxO4S3fA5vF0AddgwzMdveudoku tnFx/IMHoVdTtv0cU96jIYCCIUotslHnHjj6bUNjJ6Wc40v34jqmTH/fQCQ021ot4EE0eu2nXkR ogJN7mGumPpm/IP99Sk5Ovo49ZDTvqoGho91BA0N9XNDe/QC1tHv1/OCIh0/VRRFhTXE4oQjKH7 d27VfUmCB8Vs9BzggcCMdt/qEEED35xyPNrPwEs3eGo/TCuoYcb2YvBf7BEhcSAxaislNDM4n7p xgJR0Ea/thBKBSH0SwpBaG+2fWQmYGWTb523ubMmFUYd7+rfsGCmme1Wb5xV71SU5+5bxSlX9Xt Hmh+QP4dIM= X-Received: by 2002:a05:600c:4443:b0:47e:e952:86c9 with SMTP id 5b1f17b1804b1-48379b318bamr18979695e9.0.1771035178495; Fri, 13 Feb 2026 18:12:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , Nicholas Piggin , Artyom Tarasenko , Pierrick Bouvier , qemu-ppc@nongnu.org, Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/8] hw/display/macfb: Constify macfb_mode_table[] array Date: Sat, 14 Feb 2026 03:12:33 +0100 Message-ID: <20260214021240.58657-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214021240.58657-1-philmd@linaro.org> References: <20260214021240.58657-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: 1771035239085154100 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: Mark Cave-Ayland Reviewed-by: Pierrick Bouvier --- 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 04:22:07 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=1771035248; cv=none; d=zohomail.com; s=zohoarc; b=VIvlSkvqZTCndpH3H0vWtefxtusKR26SNsJnHSqTXqgTN0vmNGE0SDMfYSa1C33WSFQkRHgdeEvSltKmyYZ8FAbnqDM6NYXuFNzAJvLyAc+h6Q55/3RlsP4vJd5jEPjpwCKuf1ojYxC69y/+Xwo4fQ+MT5TwbZaMnrjgTx5HRuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771035248; 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=h4u43mewq1FTrot1iOEEMQ28OqdFfPZBhtZzWEB1g0Y=; b=Ex1PGmJ002KjpRJ33TvCqKLCeYB2swfcxNMiZ2PrGeLb3uICQRpQNWi4MvWWu0Ff+fVDaXlqtiQZuAVi+L6EVueMOzvBqxMNdmcVsO7HleaRw6Z9QR0+bE90xQtSf54hLOuyk6XPupzQiHASDyiS1/ukajtAyvYjhCrJ3MFM9x0= 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 1771035248741119.03424401130178; Fri, 13 Feb 2026 18:14:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vr59j-0003h4-Ko; Fri, 13 Feb 2026 21:13:11 -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 1vr59h-0003fj-Ty for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:09 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vr59g-0004Y9-IW for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:09 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-43638a3330dso1219995f8f.0 for ; Fri, 13 Feb 2026 18:13:08 -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-48370a3eb7asm46759225e9.1.2026.02.13.18.13.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Feb 2026 18:13:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771035186; x=1771639986; 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=h4u43mewq1FTrot1iOEEMQ28OqdFfPZBhtZzWEB1g0Y=; b=R96lmDqWvB7vJfKSqiPAR7KI9mKQ9eXKtsXTvMa6Nz8aRi8DDuU+F6tkwtpk+d81Gj rIXYR+8gt+e81qcNmlc0STIOx7KSinDXTZOTb3TiK+rFi66Ky7MbTi+wQuiiCDU2Oo22 UEuUSpz3WlaB9wqgqYyF439xiHfdhAk1K3+vQfozSNNRMtC7ti9AriqOy/nMyZMDSf/a mZ4i2elUOFfh+vQtAiJ8K+U3CoBi2E7SajKtHMHPK2rQujyem4UYpYwGmjcUGP2wad1M yD3b5ROiGyc0R8mH8Kb6gmOQWXsYwp68R5IxxgYtlyAzcllP87TzlZwNlAYguErwnS2h K4HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771035186; x=1771639986; 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=h4u43mewq1FTrot1iOEEMQ28OqdFfPZBhtZzWEB1g0Y=; b=PymF9HdygWegYr9u+MKDhRklTjptrQ1AnfNytWCR90OTXbwlwR96WHAj++AXEA5MM9 rnvzzhxFOuAbadPuW6KRSvCyRHWiddwq4h2WVAuK1MC5R8X4Xcp3fGtnr99r5AC5+ouq 63FdU7tH31mLFv7wd4cKDEW2mc42I8XfMb+Ks9RjdMEJOfFwxpWzGYPKOyK5CGvs8G5N n+ZdbkxBOhVCR/tY3BfkCkcFou5gMjjEXjWfTEE78ZLcJ5gd19BqyUGw4AxzbnViShyi koc0+2gxpQNgiB6iDpXriUliH7thybXWO8bBT6FbmCT34rrve26+J26KSWkjozk9yN6X QEoA== X-Gm-Message-State: AOJu0YxExnpVFJpOC6Skuc11yvUW4r2E24fTaeR7ai3WNBWnBFF6LtzE wm63NtrlqyYL7cwefH+nhX++gZ4wqyKKkIdFK8+GoHP+qfNCLLpK2jv8ejIOsM/+4LW/y4Ko6Z5 3dSeOIG4= X-Gm-Gg: AZuq6aLFyo69nFcrabPxCIEHTFT1nycnTxQcnatbSElJCKyZ3NS5FN5RgjKo4XFhBTJ BDN8H0smAe8ReziXZwMHvl6HICb7LBeiEABIYJ9cyRGcab7+IqXBhc4DQsmdT7ZYFLGnah1Jd0p 65rDljfGAJG5mMMHAROoIMDnng6JPNDVy25Sm12u77L5lXM2GQNL9Xk96zPIyC9s7K3dxXVpLpH omI+/J/WkD0emqdlyXGBIYnysXZGFrsFk0ESPkwhqgA2uxo4XtQyPlPsA7QmTty95WjMfTNAFGf x3tQKnkh1nYeUWHeYBAc1r4lePpGj0/qD+Z3I6DEoOfF27XwGJLgNpbsHyUdhz5Y3rKPPxkrfwT vC3iTYO5e84Fuo9re5fKUurJeuJhX04wvR++nQrTVqqE7fxBE0Te7Bm8VuxWq4zL0K2dCfmy/2v +Fs6EIxQEdxFnKcp6/wXvpBf7Fdo4OO+6bBcyczIJXwwX9itgDSk+vuu9/ZLiwdfQOhLtmbpr4 X-Received: by 2002:a05:600c:6309:b0:479:2a3c:f31a with SMTP id 5b1f17b1804b1-48379b93364mr16621565e9.1.1771035186547; Fri, 13 Feb 2026 18:13:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , Nicholas Piggin , Artyom Tarasenko , Pierrick Bouvier , qemu-ppc@nongnu.org, Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/8] hw/m68k/q800: Use MacFbMode fields in q800_machine_init() Date: Sat, 14 Feb 2026 03:12:34 +0100 Message-ID: <20260214021240.58657-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214021240.58657-1-philmd@linaro.org> References: <20260214021240.58657-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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: 1771035251442154100 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: Mark Cave-Ayland Reviewed-by: Pierrick Bouvier --- 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 04:22:07 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=1771035236; cv=none; d=zohomail.com; s=zohoarc; b=KLleR19eFYSeeovQQGYnaKm4PV+6OF5hu9FjOdU4ZVO5vPaVvzaYbfBvQeCcLOq1ST+VGpqUFkUPZhK+P8iqxR8aB3lLTUrj401U+EQmzv5+puCAETRbPckncccmjoT2IOCcqji900ad/qjMvTRp+6S5NXdX2fjgMSyR7W6wQcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771035236; 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=99tut9IOO9gtsFLHOORswTThLZP4XwALyE4UKZNWpNM=; b=XHn7eZDJED5bN+CwMVnQ/HmQfp7tleI5EqpLMyfjuMMjtBjUeEsw5/UIYWV99cbH8JSdCQZ6tyPYY5AKYAS4lDC968KaKZxySIfjdZo08KrR2e0GFqp/ynQJsn4kCP5OhqiUAAEvkqDA4sJpAPb5LuQ8wXnG8VFuTBYUu0ki9xY= 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 1771035236731968.0943162213212; Fri, 13 Feb 2026 18:13:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vr59q-0003j6-CI; Fri, 13 Feb 2026 21:13:18 -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 1vr59p-0003in-5Q for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:17 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vr59n-0004a5-Q7 for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:16 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48069a48629so13637965e9.0 for ; Fri, 13 Feb 2026 18:13:15 -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-4837a5d562esm19158015e9.15.2026.02.13.18.13.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Feb 2026 18:13:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771035194; x=1771639994; 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=99tut9IOO9gtsFLHOORswTThLZP4XwALyE4UKZNWpNM=; b=waiB9u5acn0S6iOlk/SDtMHzk8LUGxYuzNiEZ7SUs0skTHPBLb9H+1dq5DsQQcx3Wk pYsSbQxvl1FVfDhvg4+TCz3D+w4OjBnf+RoxInAZ3b8cTqBV8YUkQBYB1Ar1j7jCjI2j JzsuFwYG+AC0qUfzh/q0P3EJ4NLj7nGZXAGGhRrhB8A0k4NoHQ9yyR5ue3brXhBTn81U fsi22fKASdSnKCiS6jX+fQP8mZoBk9eU9tk5wGPMVdNxLjjmRfXrMCv81QM95zy8WruM t0aCmKR9YVo2Dox+nEg7q1zkUn8l4lGrss3y8XBkPmUb9ZnJvNM+Hqs9vTtSDPyJL7tn zDOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771035194; x=1771639994; 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=99tut9IOO9gtsFLHOORswTThLZP4XwALyE4UKZNWpNM=; b=uRlLvYt3mRMNp/Ji3e3Dnn7FvC5ptI5XsCOzIkcburCTF/7pykdceEnAbEnNMssz8i C13NV78iOCBwA8GvtWCPyOgnHIAEx3ctcNi8lNI18CTwpnynvHiahZvEIPYygJUg1rKi oIUxPCBwNMUAGZ+bfTlz0YkhgE+R3h7iANOKMJeigjSxbvlOL0Y3LdhAxEGkPPJzF8Qp GR1DklrJL8BI/TEhhyvisS7warknhUhnS50FV9ILJrtgDX+ODSINUez3WnYCSRcNNlRg ODNCMPX6pdIxeW/NXAaY5dx4k9pUPNSr5rGDpzFSUYrEG6O+R04LaEhJZBg24ugVyYnw eIBg== X-Gm-Message-State: AOJu0Yz5p3vEBcyfMbNdItjDGSmFRqR3SEhGnehqbmSfHtmVXVzPDZNF wHnhaR/P3+VZM65HCO9QNKYrzTtun9A1Ljvrr4dOx1d7Xg/HoaCWRMhlqRo+YRluaVhO6iuco98 mAsx+m6A= X-Gm-Gg: AZuq6aKgaY6NypMQmL0elISfV/p8s99lmjkg35XmXGbB/flJjL5uy1MV+tWZEINphXL 1//FMgx2ny+1Hz3z2QIvlNAYdwSttxZRXqDRfdSZ4GzENWVTgFcIF6arjFIwXGAgrF/magmtoPT zl1Jg+MWE0aAaG0qQNQ5GyAgx2jffVpUMDykRcA0RiKtPGa4TlWUFPbU9yc1EomlOyH/jDEH8yB HmTqpQlGjWy0pjgv6NhwjFvULQ5WiG3XGFSeY6y9C1JQIXl8iPT0kjOCM0CMiOJA2RsIQvwliV+ H8yFKCjVp0WgD0xbi6Jqpfvs+T/r6aBrICAMGLItPVFuopXVWj9KJoC+T6JQ4RIGVyf4mfUgHXc r94Qtv1S2RF3ZHZkDnGNqOAZtIc8r16DVvL1+M/uhdIMDPqXAzdZtPR7Y6Jt8MB+UjIE3VAn+eV lm1dYOgwj5WWmcJjrwOKOdrhPK3oC6od1pn8fxRH8RYD9RePEg/5icqVwZBaVl0V6jPMxdnAg0s IXuhxdoMC4= X-Received: by 2002:a05:600c:3e87:b0:480:32da:f338 with SMTP id 5b1f17b1804b1-48373a0f961mr58292885e9.14.1771035193914; Fri, 13 Feb 2026 18:13:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , Nicholas Piggin , Artyom Tarasenko , Pierrick Bouvier , qemu-ppc@nongnu.org, Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/8] hw/m68k/q800: Set MACFB_DISPLAY_APPLE_21_COLOR within MacFrameBuffer Date: Sat, 14 Feb 2026 03:12:35 +0100 Message-ID: <20260214021240.58657-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214021240.58657-1-philmd@linaro.org> References: <20260214021240.58657-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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: 1771035238783158500 The MACFB_DISPLAY_APPLE_21_COLOR mode is not specific to the Q800 machine. Check and set it once in the MacFB DeviceRealize handler. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Reviewed-by: Pierrick Bouvier --- 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 04:22:07 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=1771035267; cv=none; d=zohomail.com; s=zohoarc; b=kGKjqdMmmr9E0p7xrT/RZxzPPgH/RL89SU5/V8wmlGXS6dVH/4VFUjlHIXnsYjmQ/0nc4oTH8PdwjM17jxrA6haYk2eiIFW2GZUqIqZV7lXBmnBLoADfX3AIzhcna0ClHt3QQBTnv1euzANoTufEKeZWOGvrN4cp3vxBHwGfQkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771035267; 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=jA9tgbrEfDfZ0b8iLr0ANDvJSEYKxUdxhaspqyGLjsM=; b=L0J/+cQNJ7IGSZ/tFqkCxjETJhFuIaG3sYlW46RFrOwm6qv0++pOk9eVB2mQ8PLXAuWIiyxPUTTeYKIYh2ftG3j6hnXbnmyacFJpKWVykaUlG++VvXzUzPIm3km0zqTRqbpZlvwXx0t1HO8zC3RFIPSBjaLPFNL2OupREjtngRY= 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 1771035267065584.6648436897507; Fri, 13 Feb 2026 18:14:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vr59y-0003lV-R7; Fri, 13 Feb 2026 21:13:26 -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 1vr59x-0003k0-Bc for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:25 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vr59v-0004bi-Vk for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:25 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-4359249bbacso2535639f8f.0 for ; Fri, 13 Feb 2026 18:13: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-48371a2392bsm54809155e9.6.2026.02.13.18.13.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Feb 2026 18:13:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771035202; x=1771640002; 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=jA9tgbrEfDfZ0b8iLr0ANDvJSEYKxUdxhaspqyGLjsM=; b=VV2bMd7f1PbyJSZDTH/FhvNQb6P4OGmU8WsHdsfy5p4qj3rxoW7bEaUtYEXhIp95kU oT6TMjBavlTyP5E9ayNa4JNqxtEG7FABw6jsbNfT/MBgxSMjXap+TPtYNLRJkqu9wR5b 2oxbkktcHCcPpkNFbGRA8ehen60v4S0ylZXI8TRpdsmIi9S3LIFS7v4xrCOnJX51HJmI +lWJXdjdjnyR3pOzqgbWx1b4n4pg7DdBGSHGm5uazatY/x4wc/Fb5ViYhqjbz7C8utRj EDerRzTMZRQTfdYVTeFZWcgZYYBPe4aBGqsPQzTcHSwdgR4t2i3+xolJpsWRd1VMiTis nR7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771035202; x=1771640002; 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=jA9tgbrEfDfZ0b8iLr0ANDvJSEYKxUdxhaspqyGLjsM=; b=PJFuS9vYz6mxi9mLu2pKbMcKKOHu8Lqyjii71w4Tqdu9EqRkkV8vCzXcjMXTamrQk/ puzyes0erdGRR+J4ikdr1qjT7z3ZwS05+/KQdqiIhqSmQzZW8Dn1bJO1kn6E0/egqaPo uTADfA2psQTmltuhmpaIfSnT8CxrThCV4XesaRc5gmZEN9wwpmMHybCoNWesiEmXWyk8 1GmgkYX+WyTfO8szHIB/V10Dx25W3aGEVDIesCVov9oJn9pIy+gRpY37x0o0j8/s7sTD 9VAx/88bU1lWanl4y3Oma2xg+QvctUDurXD+MN8qDr4eJx7qWq3wiXRQmj6SzoKtce+0 VzVg== X-Gm-Message-State: AOJu0Yx2p6R/QZx9/0JUUOMHLyusGGbVS0srgkj+LLUtfsubn5eCt4ak eudeQKDkNPwkojvadXhWQ1jRBOSwcQBNtVQjm8dD/UvWB5RF3UrIAowgOsKAHwn6YBwDxA8T3mD A6AYDwpk= X-Gm-Gg: AZuq6aJLSLHWCOhnnp6fLTNdslELoWyO/bbeZS0bYHkpxSA4BJmy0KGXbGJ0WOuYNze 9RlcJ/VP1IPI6D5mHjjfharWw8T1UL0HxL3EcSR4d4xCkbEjr+3SiK8V88zocKXI987gf8hcRg0 PFqnmX2qR94TaT3BQk7PNh6fLuVrqbRkBx2LSQy8jDJmB9wMzuPIRz2ZlVReCMHumqffMgIr/oS x0DKoqj3Iknn7zL1hu0z81IOAK8oIDTyPGikhXudWaoIVgaaFpQ9g4iAqx4DXtrcl4kll3jOoy2 dR7kvpZ8ErAeStUCnsff0OtzxpoH8g+48pvvpP30lijoP4u8Cp50yhFF3BMOi+5M1AC/0R1FrDP YKtncmCSUyBWvH+tXVzmNZABs/iTHDZdxV3ZrGfwwbZPOqHz6FnTg2t3ntV9JG0d1dz5L6ykNJs AoTxR3V1uHtD6tSRSmLpFBDWYriJwG7EefqtuSabB7RCLZR0RbEZtTd0Yl+IEVuD1LGIUuCS0Z X-Received: by 2002:a05:600c:1d10:b0:483:29f4:26b3 with SMTP id 5b1f17b1804b1-48378d58838mr33975355e9.1.1771035202191; Fri, 13 Feb 2026 18:13:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , Nicholas Piggin , Artyom Tarasenko , Pierrick Bouvier , qemu-ppc@nongnu.org, Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/8] hw/m68k: Set graphic display dimensions generically Date: Sat, 14 Feb 2026 03:12:36 +0100 Message-ID: <20260214021240.58657-6-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214021240.58657-1-philmd@linaro.org> References: <20260214021240.58657-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::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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: 1771035269466154100 If a dimension is not set, have the machine init code (q800_machine_init) set the default value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Reviewed-by: Pierrick Bouvier --- 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 04:22:07 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=1771035253; cv=none; d=zohomail.com; s=zohoarc; b=AGcR9gzNBgOdw/co/XzJPTooZa/I9xuEcHYq3I9gmUDUB/jsK7r2aazMm8oJsOMz79PiHU1uEUAPSrwX+cWEfFXHOuGpcDYfp6vijrOKCwn51rZB4XjDQ42eMKxucJOT3+do7xmI9fHr+msdYxBy2lpyW4Ix1zguu8XtFwmkRQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771035253; 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=ZOdWgV2/IOn9a1EHv9glZetOs4gjLWtVaCBAgnLarRY=; b=hojOtPfe22SItc3yqn4OJdwD0SFOqeQ7y3gslypjK/MecMQf5eTAG6HRD83Ny7xCEB96hEryMW/gen7OA47mm9OILD3vbNFDBzYSqIZf5stDRJXFXFwFSduSiMt7472lhTzWUFvqLCpbWGOCm4ZnhfC4mqkSSDj/OABoYj6DShs= 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 1771035253102368.4794475850341; Fri, 13 Feb 2026 18:14:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vr5A6-0003oE-8K; Fri, 13 Feb 2026 21:13:34 -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 1vr5A4-0003nh-MY for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:32 -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 1vr5A3-0004ch-5G for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:32 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4837634de51so4538985e9.1 for ; Fri, 13 Feb 2026 18:13:30 -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-48370a41be2sm50789865e9.1.2026.02.13.18.13.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Feb 2026 18:13:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771035209; x=1771640009; 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=ZOdWgV2/IOn9a1EHv9glZetOs4gjLWtVaCBAgnLarRY=; b=oKRQMkC8n8hUD50KRmgWRsWnysiK31Pu9E+MPYsSpZi2fYbhwtp9DxgqHTztEsfgdj lUi0krpYACm5rgegDAyqiLNE/0MSa6ND+NXKje5/AkUt0GL14j6WVzAqJT7D4ZPLedr2 DwLQRdbxEQwqqf3JNnk9mhz+lcwWR4VVb4xeVdGHSWgeSZtR7VQ5s/xjE3Pjw24yz4FO P//0IwxsRzgnLij6AFpGkGQgH+aDICrZN7J3fcvC3HntSIBKKVVCGsiVPwiliBPtti67 hGGZJ8l7fobDVR29o91aJEU2UlDeRklJVNJrVYNWHrr0zFBuESFQdzrCEdqXzu0Bc2AT MYxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771035209; x=1771640009; 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=ZOdWgV2/IOn9a1EHv9glZetOs4gjLWtVaCBAgnLarRY=; b=VfxBeEN+xql/c5oHDbtePlqn0pm8KaNzrqZ7SCcLmS/Av6rZ7d7LMtk3dTxNEYHM73 +VcUKBLPmbkG9V/suPDUygvwzN5vDSCGxD1modo8NEO3elvD/F0+Baj/J62oeR04ieUr VbAK2jLsCyc1g5q2JhfRYdJvx0aNkJStVCNHk4fExr1Goe3teEvmWaHRW9wk7K9F/dwU 2ci+G/vp07VzcpZo1+LUb6qjI+CUG3sFwZpgSNCyea9oh3fslI+o+7ZX5bvixK0sBtiU gHcTD4M0XIoIpYtsQfJ3W0VsAurtgRy3f5/ZDurk1NQEuXEOgVRGOeVaW0ofJekQ6WOh Bd7w== X-Gm-Message-State: AOJu0YzZaq1AHVyRDf1zjXdR+q3qL3z6WrQegoklDqJhklFXNxb/oA6o Gejv0nQcdYEXUnD5equCbV4uM51f1T6lg7jvayRpTSPSVK80/oQ0DunGEY8oVJT5u/Sx3Fm+KQy FKAPZOYU= X-Gm-Gg: AZuq6aIsdAoutqIuzal4HbvCQdOXc+4V1C62jnFo3qm69gifmbqE6lPBvA7GoN52ir0 yVOANvXzytBZLNpPG4OGWKpEf1ZaSs7MnVGIEeZGwWuJ+G+R7wF/bAn4XrEqiXGhBQ8C/pbASrq Ci8TAKtV3sBR1G/sX7VCX60FGAXFi2QA/fVK2iqe0NSxQP8z1VrEqSua85FiR6nu7r/u7E3jITH Ltkg/AmCxflwUwGVCF4G9PIrpWi5OxCXbBgfqIqU29WJhbvzckqaPS4VTK3cbs71UZM4E2Qs1X3 E8/75C16mGe3LoBvxS3F1ffrub35yBVg7sp6NSMAaw4jbs8tJ9Hp1GAxZ45B4oxh7WWc2s+V4Jq v98qdWh8dRDPXMwslPejaLlo+ZM5ElvkmqxTql2iL1cOFxIT+SonqJ6Hy+KrdSC3y9wPnEsu5ou Lpivl5STosCpwi8xO4qGJ4UZ80ChpTaUs4Gr+4Erq4bD5zbVnrkdF3UnB4B0m93xRrOtWI0kZTZ KwudUmon/o= X-Received: by 2002:a05:600c:468d:b0:47e:e20e:bbb4 with SMTP id 5b1f17b1804b1-4837108fcf1mr80633225e9.26.1771035209399; Fri, 13 Feb 2026 18:13:29 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , Nicholas Piggin , Artyom Tarasenko , Pierrick Bouvier , qemu-ppc@nongnu.org, Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 6/8] hw/sparc: Set graphic display dimensions generically Date: Sat, 14 Feb 2026 03:12:37 +0100 Message-ID: <20260214021240.58657-7-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214021240.58657-1-philmd@linaro.org> References: <20260214021240.58657-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: 1771035254143158500 If a dimension is not set, have the machine init code set the default value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Reviewed-by: Pierrick Bouvier --- 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 04:22:07 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=1771035249; cv=none; d=zohomail.com; s=zohoarc; b=WXYqS1G89p7I24R0bpmcGQF4SCXtzcfLuyHWbz1izTldLYUkvmDOhmSD2SuG+v+popHQk3TUG3CMhm4x8NwKcCnv7s1W8wdEJdi2hZPzRDUepVSQ3FJQHWiI9DKPxaPiFAgXCtUiZDL+0r+NHiYEXypW13We0V979B3ZGXAeoVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771035249; 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=CxZmHoD4NLKTu0jEJRVbx1DWKJRYt99sqgMKoBjz8/o=; b=Dz1ZhlnFwQ3Qy8QazeYld64EECJIqqW7ImPFwJA45jEEEL2uSY4zwcYzxTdl8dDUb73JnxmBuAM7ioX/RaIdCCLsfSmWcg71xorzYLQsSsAxmoRc/wOpIGTf3pYnl0x66TqNs+gbemI27gXHAvC159E02c0xSr5demhaLsrSHrQ= 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 1771035249423928.3024011964743; Fri, 13 Feb 2026 18:14:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vr5AD-0003qf-PB; Fri, 13 Feb 2026 21:13: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 1vr5AC-0003p5-G0 for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:40 -0500 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 1vr5AA-0004dJ-If for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:40 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48379a42f76so2885005e9.0 for ; Fri, 13 Feb 2026 18:13:38 -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-4835dd0deeasm216705805e9.12.2026.02.13.18.13.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Feb 2026 18:13:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771035217; x=1771640017; 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=CxZmHoD4NLKTu0jEJRVbx1DWKJRYt99sqgMKoBjz8/o=; b=kXJuLaPMkah1BijVX7sJCFlsCmU4hqY88s0bpLJGUC1jnrhZJVxmAgCzF+QNzuc/CF 4c6pmhDVnDJ8DSQpjXG8NTHTTpd5XWfSjAypXS635do6T4A90kdlB8iq0cYylOlAGNvU 19mPw2kmFtXb+QP8Gs0sluM/aec/7RMsSiZRX7EHOSApLW54cRzJtJVeN8kfzr3ubveC 1yGFp+czouu70WTAa6Tvc/MMebWo17uizog4m3rxJM1cdPn2eRqXi2Gt0MTjybqr3k52 ojlNvzNesaMSamF8DeyoDDLQi5MZWv4z4AqtRLHgwwIFsCdbdLIGmOoT51KpCE/ry0A9 H/XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771035217; x=1771640017; 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=CxZmHoD4NLKTu0jEJRVbx1DWKJRYt99sqgMKoBjz8/o=; b=j8X3DROP1+RpSg2KNIn5MVtMS9BtV6Tjvy/AvdXpPuwrjZ4LqFr7PnexlWw8dOBxwG oFKFiG0QluOK74+W2fEknIqbUnVHyavuSSM6vrvySSYvghX6HMand/r6a3EU9RNQ9vwo 1ojYEAU4NZRSoL2crrj3Kdrn1NU+1SthU23ktXw3YpcH+dNd7PDdisn7JenmT4c0Mu36 VDnLp+dt/v5I5UqtAnGCFiPJuS14lF6JoBlFfnJy4uhiSnR2joc5/3bqHXpuj8KQ3FKh x4jVDrKK9bAoPBClI9tbKDi2ZVl3daLE5J8zCrZaqH/vRsYYnkp7V0fo3/Dg1NMOJZu3 3CIQ== X-Gm-Message-State: AOJu0Yx7AbrGenWR4qclBqwrdCTqd4zLYaW8R86SNwd4IvLi6dnoTfdZ kuW8L5SXNiP5Cx0YHKhp8xBNUYCMRPz+vwy7+n+HA9osfZ86z5qi0MAepXaa3O/CsM9/1PlpVik awyRGt2k= X-Gm-Gg: AZuq6aLk4IucDEyrVl+7haeG4CTBHfI0M2HHbkLQ3BC5uZB7Fg1lQHkHAhcdTvVdMlc M2lPVGFatXtEt/tTjV2iMEQHnfWsRyInxnn3e2zeGYVASCFZUSb6NajEZl8PHUcliCc8hxt8XOS gQm/+8SbPuRRkfbVacdrcSgXt28kRt9lQ5ZB51dkFtMyto/9GXV2OTqwa714HYvz8he015YzKyw yZXZmrPStB1/f5ihkltHoqXyajHXUjL8FmNUcSkvDGGVFf3MdiueHE4WiG9PoxfH+JKbDS1rNG3 lpJZL1rlfNSoVC+ZNkUdqtvXsbcRk4QzOVGQpbORz3ASLHvViy04BAqZGuxYX/1VvZ9Av356gfs hqAa3K2OsvWI4sbAYY2O/ITEZcfXCzKDR6ta9JmJ7hhIm16Xfvz+z98F13kSrtP4bTrXFCO4Cf+ gcr9A1ha3JzEczoaeu9bLZBeMUTDRYcJxzjfqA+Hc6oGjqs5jlhNF5tre3dG2EG0OZhMZWbOD9 X-Received: by 2002:a05:600c:3e06:b0:482:e5d4:b7ca with SMTP id 5b1f17b1804b1-48379bac81dmr19399765e9.8.1771035216806; Fri, 13 Feb 2026 18:13:36 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , Nicholas Piggin , Artyom Tarasenko , Pierrick Bouvier , qemu-ppc@nongnu.org, Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 7/8] hw/ppc: Set graphic display dimensions generically Date: Sat, 14 Feb 2026 03:12:38 +0100 Message-ID: <20260214021240.58657-8-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214021240.58657-1-philmd@linaro.org> References: <20260214021240.58657-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::329; envelope-from=philmd@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: 1771035251523154100 If a dimension is not set, have the machine init code set the default value by calling the ppc_graphic_dimensions() helper, common to all PowerPC machines. Declare local variables to avoid using the global ones. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/hw/ppc/ppc.h | 2 ++ hw/ppc/mac_newworld.c | 10 ++++++---- hw/ppc/mac_oldworld.c | 10 ++++++---- hw/ppc/ppc.c | 8 ++++++++ hw/ppc/prep.c | 4 ++++ hw/ppc/spapr.c | 4 ++++ system/globals-target.c | 6 ------ 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index cb51d704c6d..14cc09ab22b 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -102,6 +102,8 @@ enum { ARCH_MAC99_U3, }; =20 +void ppc_graphic_dimensions(int *width, int *height, int *depth); + #define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) #define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) #define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 7275563a155..daf0029c01a 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -156,6 +156,7 @@ static void ppc_core99_init(MachineState *machine) DeviceState *uninorth_internal_dev =3D NULL, *uninorth_agp_dev =3D NUL= L; hwaddr nvram_addr =3D 0xFFF04000; uint64_t tbfreq =3D kvm_enabled() ? kvmppc_get_tbfreq() : TBFREQ; + int graphic_width, graphic_height, graphic_depth; =20 /* init CPUs */ for (i =3D 0; i < machine->smp.cpus; i++) { @@ -432,10 +433,6 @@ static void ppc_core99_init(MachineState *machine) =20 pci_vga_init(pci_bus); =20 - if (graphic_depth !=3D 15 && graphic_depth !=3D 32 && graphic_depth != =3D 8) { - graphic_depth =3D 15; - } - pci_init_nic_devices(pci_bus, mc->default_nic); =20 /* The NewWorld NVRAM is not located in the MacIO device */ @@ -480,6 +477,11 @@ static void ppc_core99_init(MachineState *machine) fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size); fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, ppc_boot_device); =20 + ppc_graphic_dimensions(&graphic_width, &graphic_height, &graphic_depth= ); + if (graphic_depth !=3D 15 && graphic_depth !=3D 32 && graphic_depth != =3D 8) { + graphic_depth =3D 15; + } + 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/mac_oldworld.c b/hw/ppc/mac_oldworld.c index e679d338985..ea1f778877c 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -108,6 +108,7 @@ static void ppc_heathrow_init(MachineState *machine) DriveInfo *dinfo, *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; void *fw_cfg; uint64_t tbfreq =3D kvm_enabled() ? kvmppc_get_tbfreq() : TBFREQ; + int graphic_width, graphic_height, graphic_depth; =20 /* init CPUs */ for (i =3D 0; i < machine->smp.cpus; i++) { @@ -288,10 +289,6 @@ static void ppc_heathrow_init(MachineState *machine) pci_create_simple(pci_bus, -1, "pci-ohci"); } =20 - if (graphic_depth !=3D 15 && graphic_depth !=3D 32 && graphic_depth != =3D 8) { - graphic_depth =3D 15; - } - /* No PCI init: the BIOS will do it */ =20 dev =3D qdev_new(TYPE_FW_CFG_MEM); @@ -321,6 +318,11 @@ static void ppc_heathrow_init(MachineState *machine) fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size); fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, ppc_boot_device); =20 + ppc_graphic_dimensions(&graphic_width, &graphic_height, &graphic_depth= ); + if (graphic_depth !=3D 15 && graphic_depth !=3D 32 && graphic_depth != =3D 8) { + graphic_depth =3D 15; + } + 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/ppc.c b/hw/ppc/ppc.c index a512d4fa647..d7b4466d701 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -29,6 +29,7 @@ #include "qemu/timer.h" #include "exec/cpu-interrupt.h" #include "system/cpus.h" +#include "system/system.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/error-report.h" @@ -1557,3 +1558,10 @@ void ppc_irq_reset(PowerPCCPU *cpu) kvmppc_set_interrupt(cpu, PPC_INTERRUPT_EXT, 0); } } + +void ppc_graphic_dimensions(int *width, int *height, int *depth) +{ + *width =3D graphic_width ?: 800; + *height =3D graphic_height ?: 600; + *depth =3D graphic_depth ?: 32; +} diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index c4efd1d3908..7077b047b25 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -43,6 +43,7 @@ #include "exec/target_page.h" #include "system/kvm.h" #include "system/reset.h" +#include "system/system.h" #include "trace.h" #include "elf.h" #include "qemu/units.h" @@ -250,6 +251,7 @@ static void ibm_40p_init(MachineState *machine) uint32_t kernel_base =3D 0, initrd_base =3D 0; long kernel_size =3D 0, initrd_size =3D 0; char boot_device; + int graphic_width, graphic_height, graphic_depth; =20 if (kvm_enabled()) { error_report("machine %s does not support the KVM accelerator", @@ -412,6 +414,8 @@ 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 + ppc_graphic_dimensions(&graphic_width, &graphic_height, &graphic_depth= ); + 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..c50c7da34d5 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1143,6 +1143,7 @@ static void spapr_dt_chosen(SpaprMachineState *spapr,= void *fdt, bool reset) { MachineState *machine =3D MACHINE(spapr); int chosen; + int graphic_width, graphic_height, graphic_depth; =20 _FDT(chosen =3D fdt_add_subnode(fdt, 0, "chosen")); =20 @@ -1177,6 +1178,9 @@ 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))); } + + ppc_graphic_dimensions(&graphic_width, &graphic_height, &graphic_d= epth); + _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 04:22:07 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=1771035264; cv=none; d=zohomail.com; s=zohoarc; b=mBer3y49tyMT7gy8PoEKwSeKt9ClG7Zq98WhIcHqLGw+ZAtbTyj7IJKLf6rlaGrcwRFO2jWL5K9TSQuirb8yFLPpMic23dzBIDc5qsQZ6OM0wjG6eumchbP/5sfJGM9CwezxhXAhmvfFH2poLc2tCqvuDkb9WOsyJvk/cfu91rQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771035264; 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=IBfS1gwelZ2mj2qarZUPVGv4uT0cGemLv8DXYJc3eqg=; b=chs+qBywGVmv2Il/12Gq1IF3xyKwk0mVAe94nxyIjYJ1h08+T9U25r7mJRZ6Kdx64l8z1zhcRCiXoImcBJgkHX5LGncDoaGAAn4+Dkvc6PmR5IC5cI1/2i1VDmeE17guk1ottb8qsPznLN45Sts6TiBoDifPkJ9gxUaGf72LBK0= 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 1771035264739704.308138592663; Fri, 13 Feb 2026 18:14:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vr5AL-0004NM-6i; Fri, 13 Feb 2026 21:13:49 -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 1vr5AJ-00049K-CF for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:47 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vr5AH-0004dq-NZ for qemu-devel@nongnu.org; Fri, 13 Feb 2026 21:13:47 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-48372efa020so9277655e9.2 for ; Fri, 13 Feb 2026 18:13:45 -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-43796ac8209sm9885016f8f.30.2026.02.13.18.13.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Feb 2026 18:13:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771035224; x=1771640024; 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=IBfS1gwelZ2mj2qarZUPVGv4uT0cGemLv8DXYJc3eqg=; b=SEZtf8XFVgVTmh310w4BaWz+InFg8ztedq/p+g/dRvSrlfGmDzSCMymnq13jInehMR Lcm3wSQ/7khSNh+BixvAlrEz3PqFJfSgPH5gk9jVtWqV3fFmaqLGxxnCxcE7yJZQ9tCy Sw1qacHAcZWFSk4S3/y+5Wz1o9ys5+FfwYqZNNJTrZyC0KtZ64RVCQXs7+K4XL/tZdUA CpqOavz2K7LNG9GIYSbE+/pYzaFkdIQA4NiK+YKbStczH6+6Xsu9iflTnzBGqj8FE4Ts m1pHpq4DHwMzUS63m0Xbf7xw0BSInCrtGbkF9lBvoJPmgqUHOfR1zmTRUuCaYyCK23bp ktzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771035224; x=1771640024; 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=IBfS1gwelZ2mj2qarZUPVGv4uT0cGemLv8DXYJc3eqg=; b=clGIl1ssQ3Q25gmXgd6gWkAAAPdghMuUHVnsF4bJXDPa7ObxBXpjouEEjMCiryDo/o ZN7omIHtPe9wMS12RhHQSDz80nVENWZdtbP/pGYOGw6uoCaKvibm9OI/O8al9LbkeSpu OmYOWIMdUC0uQuDZgHNjcJShyM8Dd0NEKtaGlurkkMSFOVtUKu78S1qncHBKzAVY8uSS jbKq7m8sTVmVGaA8Yt2p0+HCGBQS3e5UfPd5Nh6gfWJoCJBJIdEIytpOAKue7z0l3KMh 5A2e/2PzaGexglHLR1ni7+/q3g5QE7NjJOeuYk9OXxFLX6KgJkK0JQa97v6gutUeMOxC HNvg== X-Gm-Message-State: AOJu0YwH8FUMJ5UqgQBC5tzRU76mB3NEqeSfHtdhPg7OLP40gZj8z6lQ Y1ds9gZYZOjNF39/V3fcZedc0l+vBzSi0IUtUMZqu/VQW6YYfP8qILLbWIzOO088iBbdKrBWFBm SPZ3QYJQ= X-Gm-Gg: AZuq6aLuLBonv/MbsTOoD4HHMbhxZV33PnpCMfXpxVm5mPCDKJMt2bUvHR1SA0R1ub0 ftmNLHjoWPaJYzgbcpj1wZSlbVHHzT4LoyLxUJv2u5wuSwx0Soge+y82AHaAMpCZRo4dg2ttlOM b7MOMajHqU2+RNFuPJo8vjDYw01k7Tb7FKDyDITnO6kUUgoUnZHHgRbe0mv30VfJHzYuF7jtpi2 5n1zmZ0Ph/XLFA0JWmz9gi3HchMNQTGm6rhNDn3ed4gA8OxIYhuKZyXjRnSpdieOxji9PZccQO4 IkGjTSIHlJSPcGH2Bviaw+gCvGyyMx6/sObS6kMddZNBTjzqw+yhG8RRjMfDehZRwvDpl8n1JJF u+j4PLUg16+O4dXd99cvS2heRJPmjsHyb94s9uHwXx7J72L2begUnhdIDYKfdJBYtd45m/XZwOh w+5t7r41sl2mjZsL2Ly4xp3Vd+sGZCtcvhaO2KetECk3/q7GujrE/YjByqTOksTNYvFEV9tktU X-Received: by 2002:a05:600c:83c6:b0:480:6941:d38b with SMTP id 5b1f17b1804b1-48379c1cde5mr13980735e9.30.1771035223809; Fri, 13 Feb 2026 18:13:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , Nicholas Piggin , Artyom Tarasenko , Pierrick Bouvier , qemu-ppc@nongnu.org, Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 8/8] system/globals: Build as common code Date: Sat, 14 Feb 2026 03:12:39 +0100 Message-ID: <20260214021240.58657-9-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214021240.58657-1-philmd@linaro.org> References: <20260214021240.58657-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: 1771035267699154100 Now than 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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- 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