From nobody Sun Apr 12 05:59:17 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