From nobody Sat Apr 11 21:30:46 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=1773009305; cv=none; d=zohomail.com; s=zohoarc; b=bsY3ZzaQERGZhQE9wmPD5IrzYXPREsF9cbcT7oY7zG5XNsZae8z8w+H96HpDs90/iBEKDXurWXRN7fIaIv0u+FVX0AC9lpRSJvSfMhUS7i1Ju//e4AwDHUUB1SXjYcmKjtOKgzHXOtLX8Ql+ps52OKpe95PgAEcFZ4nbwKqzG+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009305; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=I3iCPUqgY5scKVR3y8X/ei0qlp8YojJCAKqyusz3u98=; b=MbWPoUEp+2s6DRxMDineo3h6SrjyC4b3+OORecVtIZTHii/h5SdqeBVTYmueKW4mN0MqkOOJVErJcitFkS7atQUPYCpWUPOUru9831fnVSJy/9yfzU6YeDaW5/jppiym4nlv3Fq/AJKunXsxO5xiP/bo5gXM6GTa3ZZ4MLzZ2yQ= 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 1773009305306945.057083641326; Sun, 8 Mar 2026 15:35:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMhz-0007dS-Bo; Sun, 08 Mar 2026 18:34:47 -0400 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 1vzMhy-0007dK-52 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:34:46 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMhw-00033M-Kw for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:34:45 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-439b73f4ab4so7613951f8f.1 for ; Sun, 08 Mar 2026 15:34:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8d95dsm22917415f8f.7.2026.03.08.15.34.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:34:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009282; x=1773614082; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=I3iCPUqgY5scKVR3y8X/ei0qlp8YojJCAKqyusz3u98=; b=aqVZIYYd/+/sxBA7BvqnEGE4MB8GHdHRgWuoMT2j0c+7xI+Hk9IDbIlbSwHSiEKi4H 9CMjFzZM8/bM6t+MNrTkBEQeMzwlIpe3TB7kVVOgUPfD8KCzH6dEbBM2w8hX/oV3IAjr 31VYEWO1a2SHj6J5zotoJMm/aW/KejIJLvus6VMyWsxEndmG2aG6aesGdKFnnU14CLTF 4RxI3QBY+hF4WIYYnjWj/XLY76bZCKzHlM9OARrfbrvyCsL9uBYxR33/kc4kxabtS9i9 tVqUm2/JJL+x/setUtRDUAjLUdLgbClijdIhp6s9YNDo5JTarOWyAw2sGujUHpkr31wy qbug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009282; x=1773614082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=I3iCPUqgY5scKVR3y8X/ei0qlp8YojJCAKqyusz3u98=; b=fxm6XPSynUBvz8nCqkWao7aNdja/5TBI8FqQJu5ilyyQqzlnBWg/fY8OgL7rH4iCUk V2MlHyTSNJFZB83Zjoxf+/Kq8msdXf83x0NgLq+pnM5NuCbt+zqi+pKrpTe3YJbuEmc2 d7+vIdG9kdmL7BycNXWs7k3Z+u9d3UHkuP4mwAaHVAsiCUqKbhxK8wUESqtVvu9yOKYD F26qPgPcgt86C9KvAZby8rLIN4ocsGGr2YgV3YDAgCE1jmbQ1ZBJ+1gANrQmzE5jS1ff nJF+O1Yg9yAHGiXA4UoYGRTpq93wfwwNPmHnbFTXPG1q1/8dM5KWoa1lI6GhbaTKfZkH EYEg== X-Gm-Message-State: AOJu0Yx7tnYxczi6Etvxad/M//MYd4qETir5uQnvlPVVvQTLKMhTBPfc OI3WALdCI8U05xspCAwscsvG3/BkA1I/xgeJQFqDFvyxGso81TyRkLrYuF8dHfCpxoAW/G8ZC6n Qf7hEqAE= X-Gm-Gg: ATEYQzz0Qlrm1U/bCB++78jF6e/U0HJa+4f2M3qZ6///l8SL940Z623oYRILU9L/whc luShzW39S66VwzCQ2Q+HOtZ2tZPVfAB2wTpRJQVQugo8aHvu+aqzGZTT+8Idb7GUHMJqRBWZ77J DbU1sz/uxuf28uWph5KislsMEDpX+6VkBOPwcxGjmEodJWxnFvs+1L+oRyFyFDlxvrHGsGwYtaC R5JROMLeF2iblUNSlW9L0126VKvOJuvYB1OhiZsDXWLNH+WqvxfqqjUqmwsjiaoWqrXNJST76+r t/xrlyjrChLmOniNBrbZumoXDxQ2JVyTfQ7jtw32157XMvzsjpNUjSkafYO7G0bVNcPT06BkCLp rjGyc9oxFDmLVyMaWYlzgdeYAYhY1ICpLPd/GNniuNG4aJDaPafF64WYTnfRtgD4nK/yRy/yE94 uqvjQLBW2OGMX0G8cAZxgM/qJnpLZGY3qTsq8xPXh4JV4RoaD9phd2Nvpd4CknF3ESzWF6cCWVe BH3dQ== X-Received: by 2002:a05:6000:2893:b0:439:b6d6:71a with SMTP id ffacd0b85a97d-439da89ec91mr15310687f8f.51.1773009282377; Sun, 08 Mar 2026 15:34:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/49] hw/i386/pc: Remove deprecated pc-q35-3.0 and pc-i440fx-3.0 machines Date: Sun, 8 Mar 2026 23:33:45 +0100 Message-ID: <20260308223433.25503-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: 1773009307045158500 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307150042.78030-2-philmd@linaro.org> --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 961432176cf..29c8e997131 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -668,15 +668,6 @@ static void pc_i440fx_machine_3_1_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(3, 1); =20 -static void pc_i440fx_machine_3_0_options(MachineClass *m) -{ - pc_i440fx_machine_3_1_options(m); - compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len); - compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len); -} - -DEFINE_I440FX_MACHINE(3, 0); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 261d759a223..f102da8e4a1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -614,12 +614,3 @@ static void pc_q35_machine_3_1_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(3, 1); - -static void pc_q35_machine_3_0_options(MachineClass *m) -{ - pc_q35_machine_3_1_options(m); - compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len); - compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len); -} - -DEFINE_Q35_MACHINE(3, 0); --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009327; cv=none; d=zohomail.com; s=zohoarc; b=VrGHHrZg/2R/6kYntDSd8uWM4H5Q4waoH8jj1JlSUX6ytMsBCGNK7iLUFjsS7YaOSLUgwljS34Invc/lOTV9vQEoVdg+Bmc6idpEupen0sHNnePag2G3eo391p2LUwT+w5GrwHC24FnvYFtd8mLgg8ARk5xWRtWI8Gz482gUH/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009327; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=8eQ2jsUndrGbrbiy4u8g+gyu8EistUvOdyha5m9ALGc=; b=M2cQJIZ9nVxNz/dg3pRj5qjRW6IdKI+UMZ8LjWTEoSPtoBGSYzCLpX1QyLGsz9/Ug3GUWoonV7bgQFpSGZJf7NxQ8SASF8BLlu5ja1ZwWMf/m5acSi9UpwbDoJSljAuelLZD0IKgi2K1xp3m9XVzg7oLh6G9wa4iCTfcgSouQN0= 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 1773009327743965.9016840084952; Sun, 8 Mar 2026 15:35:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMi6-0007ee-Ob; Sun, 08 Mar 2026 18:34:54 -0400 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 1vzMi4-0007du-GI for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:34:52 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMi2-00033c-Rh for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:34:52 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4806cc07ce7so127841245e9.1 for ; Sun, 08 Mar 2026 15:34:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fad27e6sm300901875e9.3.2026.03.08.15.34.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009289; x=1773614089; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8eQ2jsUndrGbrbiy4u8g+gyu8EistUvOdyha5m9ALGc=; b=xBoVpFwUcXjAUVxVUgGXmaEp+BzC0plD12wstD7C6VbYwbxAT74aBu8xozPsI86KhM 43h1jbpPr/LzyoNq/A579Et94Bv81qKLb5zmcpv/syktQCdrYzpLkog5TyW5dXWJGxd8 ekgESmV3PFvv1SA08iuQwOUMqFwH2rBC4QWy1jLxxgI6GwSrlteF78muWAdz7T+bIFQS tuBpz2uhs8SnxsFo6XqCkGWE9zsvQTSalhDhwdvSNxZ+nk9Tk4nEV1GJ7mcoVQJfeMaf ko7FDzXrTdqyplCq1pRIkBwEaR+jmfVR7KVFXX0tQi5ALaNSsAXPzXTfwas1ZESNctsc M/ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009289; x=1773614089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8eQ2jsUndrGbrbiy4u8g+gyu8EistUvOdyha5m9ALGc=; b=mAJdLVweIfhwMTjGbxvCbDv7idOvOB65NTB47V1Tf6eGIWR1D/xSJmn37e2wZELu+n hxutZLf49NRe/ChW/CgF44ZLOt2u5gokM6OsiYtnS2ZCtkd0KuhekG72QUbEyv2W0Qpq wgGo8LIVz/2T90aMS2XHuFyRla9H369H8kY3rjmsCJEkWwuAQU91G6BDyghbavy3Nb3k YXS7OIeXbpkfGgcofRjySup/kufxKcgVWH2o/rG+V23IBZyyYNHvO5gRt0xec76vO5Zn /MCjTnV5v9F/KOStA9JOledue16fYGXfsXjLqRyZJwk2UkVINbdE1ifOBitPx+0Zel1R klag== X-Gm-Message-State: AOJu0Yy2x9H2HoYgS/8OVmiun3oxrV5KtDQCo7dzeuW4Cx5VxevSINF/ sXRYh9Ilv8yoxgvORWBRjos+q0xonyloah1WnUjtbU7mb76wKM/yxFHhViwenyQBlO4LeDBW/O7 wRcdlZTA= X-Gm-Gg: ATEYQzxBWzwO7356AKeaKORxYFNOJ+6/ri0Bu6/gI8tb31V+6dhx4htSSPpBEb+NOu0 Yk139CfhyCRRQ0KRDj7nCRr5P6LL5DNSgqyllRgXSgmnw6HyU9h4n1E1OLMvOviW7CGKqHG3FTr 9OtrbFlHONA7Px8ub6qYvBOoOor7ymL4GBDZ2WIQD7z9rwO+ksbviuzYSmpdgKROd8sOcqFbcKw F1HpUwQ55nowkKzM9PIKAjJXETcmV1hzcwSb06VV7vgCQYUXc8MhVi6GK/aVpCPG064g7gG0oEr np29zhS0NLW/SyQ6Ru63rPeldiCr4OzmQESS6G/oYl9eegwi1aa/a5WC7qz3TO7Q/pc+572IA96 tJH2jQ1sIWHctAYiR7BXlhwH2cKS6iqAfcVZfTYxlbD8BoSEbhSHg72sMkIfVnNJV20f8Io/OiZ aj+7WVHXtA9pxJC9hLdFTFgprNOHO/EaZaJjhE6mIMxOUklZpSG8mlfOLFUaHA+f9hD54MHurS0 Rtf8g== X-Received: by 2002:a05:600c:a013:b0:485:17a7:b9cc with SMTP id 5b1f17b1804b1-48526958835mr148689045e9.18.1773009288980; Sun, 08 Mar 2026 15:34:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/49] hw/i386/pc: Remove pc_compat_3_0[] array Date: Sun, 8 Mar 2026 23:33:46 +0100 Message-ID: <20260308223433.25503-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009329333154100 The pc_compat_3_0[] array was only used by the pc-q35-3.0 and pc-i440fx-3.0 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307150042.78030-3-philmd@linaro.org> --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 7 ------- 2 files changed, 10 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 113813c07d7..5623660f5dd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -277,9 +277,6 @@ extern const size_t pc_compat_4_0_len; extern GlobalProperty pc_compat_3_1[]; extern const size_t pc_compat_3_1_len; =20 -extern GlobalProperty pc_compat_3_0[]; -extern const size_t pc_compat_3_0_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 819e729a6e3..a38634e3577 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -214,13 +214,6 @@ GlobalProperty pc_compat_3_1[] =3D { }; const size_t pc_compat_3_1_len =3D G_N_ELEMENTS(pc_compat_3_1); =20 -GlobalProperty pc_compat_3_0[] =3D { - { TYPE_X86_CPU, "x-hv-synic-kvm-only", "on" }, - { "Skylake-Server" "-" TYPE_X86_CPU, "pku", "off" }, - { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "pku", "off" }, -}; -const size_t pc_compat_3_0_len =3D G_N_ELEMENTS(pc_compat_3_0); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009310; cv=none; d=zohomail.com; s=zohoarc; b=jqcA+ojkolx3VgQV2CXuyZ2LtscaH+GxqSVZzzaegFd5A/D6nqYSK9OkFOE4kvjo0R9XvC2VNuIYqEEum7SGpDC7X8yvSxrW5YRrzIhFaCWSxrWBukmnyuha+QCi4fvUzvuoEoTdKyLuR+1LotzCejjqk1OqiV4RnnyIbrATpqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009310; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=2eWZXbz4yjyxTABS3MihpjpSp6QDbbBisgS9JgOQq/Y=; b=CJMZ+d8Y+FLPGR4Aw+tmPYTJXVPHr/nfHBOI2CqkwIw2T0NKyM6KVLOsHQJsYgOovfRHT0f+5UWQava6WasiPJoElTk1Ki2N1br2BMLboI2XRYsQM1nhWu9IN7y3ukgGXqD9hHZRJBcHXUFjtRK/r8aLTxGOzuADpkwV6LfAjkI= 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 1773009310095644.9976039461606; Sun, 8 Mar 2026 15:35:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMiD-0007fK-QB; Sun, 08 Mar 2026 18:35:01 -0400 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 1vzMiC-0007et-3l for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:00 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMiA-00034J-Ff for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:34:59 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-439cd6b0aedso3204339f8f.1 for ; Sun, 08 Mar 2026 15:34:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2b9fbsm21102875f8f.23.2026.03.08.15.34.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009297; x=1773614097; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2eWZXbz4yjyxTABS3MihpjpSp6QDbbBisgS9JgOQq/Y=; b=NNNeIGfnFa3xT6qxI/X/sRBeuF3nV75wweRuQ/lwEONi95RW2zHiIZt9XKT/uYOCk5 db/RBiM4+eiO7cpVSrl3cqCB2HSNzIZ4+P4Kp9wxHsQl/GSX55aODVDEohPKGSnYrKFj VpRSYiXjk3YtMrFC+eb9sNM7Af3HF0ZeGHWY9u98ZpuFoi6pUEsGQFRd80LhCAsRLfsV dwrCMYgY/0AJb/CxiAX95zMVc0Kg/S/y8j7LdrpYgtlIzx8T7AUPJ+sMB7Fz6FAiToY3 DEBryB3blnt9+I69eP4j5QUSJ6CdrIXZou07g8E8q2V2IJDMrlcapbci0SiRFJD3YQnK KPTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009297; x=1773614097; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2eWZXbz4yjyxTABS3MihpjpSp6QDbbBisgS9JgOQq/Y=; b=vxdlgdhknlD7AjkkbUx0QDwoZrDmwcwpio9eV7RAQAFSYmliCD0okndSlr3546n+U9 vb7b48ptlR0xIxWgQ0vRbyd1TojJaQTiVk9SUHEbZChxELPqQAMxenedgqYl2dvnsCtD biJ7db8LWIDWnkJncT6fa7lT/rMpwNLZYfvUG18Q97PisfwX/qmYPkQjvdFgnbZn7kQh 1FYcK/V1/HBWLKRp5/DFLbZtA6BZl1ZjcR+w7vGnUr8i3navjh3RCmANcXEh0bcQr/lA FORC0FznPi6ot/bFHaNriU1adNOsGnehLPr0AEt5cu9a808IniE+xNFDyZop3MSbtOQj vrXg== X-Gm-Message-State: AOJu0YwMMS6wVzHINRh2AuBi8KtFxHairT+sIkkvB3DE3egOjx14qQ52 c3oHKCtcVK7V/wVJ2eJEMPsLSHHU4faHVTIHjM8RSGMtCv+byE03x231eExdxL663+PjCG0qKyj uu6NwNzM= X-Gm-Gg: ATEYQzxJJ6sLXTJDfEiI47eDmUtF8ROODjSBO9UPRwH4o4J/P/I+oYlDfKb5bq6q/f5 lmHH2d8Q5wpR3iiMQ7Akjk02v+uZRijgVmqAwZOMDRK9bh8FmQt5MWiyDPvtmGsG0+0DQIvlEEc nTIWhok1gYPhvqU38/r7UxVvxADAo1nBNSVuqXWD0ZrRrCsqHNPYYslnff+l7TaImXoXmGIQcfD JoKfBi/ds2eoyfkmqU6zbCC4ritXvuXOWN1oyJJgxkHhTchQkw0SBYQqCF+Ah3ET6XbI5iD6BaH PJKY2NVWgOdMBsIay9TRe1gzPGF57uE6jhggE7AIrgc18Qw7mgWrB58hDKfGQPGJkjp2cUQo5nh 41/7wsnf0qVrOfvJCeUbcjvpflb0/8/kt2gFpkPJq1DP5KkXywtb7LdrxkAaWgi0so3046NpkcU QFhQZUOCZbOI6q2W8CBfEeEuta+GchGkv+z5G78jbOyPvEP7q6IVpe+CZkt9cKcTg6voqXEyrDW vDKCg== X-Received: by 2002:a05:6000:1865:b0:437:8fd6:d849 with SMTP id ffacd0b85a97d-439da8a2ef3mr15383767f8f.54.1773009296475; Sun, 08 Mar 2026 15:34:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/49] target/i386/kvm: Remove X86CPU::hyperv_synic_kvm_only field Date: Sun, 8 Mar 2026 23:33:47 +0100 Message-ID: <20260308223433.25503-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1773009310834158500 The X86CPU::hyperv_synic_kvm_only boolean (see commit 9b4cf107b09 "hyperv: only add SynIC in compatible configurations") was only set in the pc_compat_3_0[] array, via the 'x-hv-synic-kvm-only=3Don' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307150042.78030-4-philmd@linaro.org> --- target/i386/cpu.h | 1 - target/i386/cpu.c | 2 -- target/i386/kvm/kvm.c | 15 ++++----------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index f2679cc5b72..2b70d56e9b0 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2335,7 +2335,6 @@ struct ArchCPU { =20 uint32_t hyperv_spinlock_attempts; char *hyperv_vendor; - bool hyperv_synic_kvm_only; uint64_t hyperv_features; bool hyperv_passthrough; OnOffAuto hyperv_no_nonarch_cs; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 01b64940b17..c77addd2c25 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -10589,8 +10589,6 @@ static const Property x86_cpu_properties[] =3D { * to the specific Windows version being used." */ DEFINE_PROP_INT32("x-hv-max-vps", X86CPU, hv_max_vps, -1), - DEFINE_PROP_BOOL("x-hv-synic-kvm-only", X86CPU, hyperv_synic_kvm_only, - false), DEFINE_PROP_BOOL("x-intel-pt-auto-level", X86CPU, intel_pt_auto_level, true), DEFINE_PROP_BOOL("x-l1-cache-per-thread", X86CPU, l1_cache_per_core, t= rue), diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 27b1b848d6a..a29f757c168 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1278,10 +1278,7 @@ static struct kvm_cpuid2 *get_supported_hv_cpuid_leg= acy(CPUState *cs) } =20 if (has_msr_hv_synic) { - unsigned int cap =3D cpu->hyperv_synic_kvm_only ? - KVM_CAP_HYPERV_SYNIC : KVM_CAP_HYPERV_SYNIC2; - - if (kvm_check_extension(cs->kvm_state, cap) > 0) { + if (kvm_check_extension(cs->kvm_state, KVM_CAP_HYPERV_SYNIC2) > 0)= { entry_feat->eax |=3D HV_SYNIC_AVAILABLE; } } @@ -1543,7 +1540,6 @@ bool kvm_hyperv_expand_features(X86CPU *cpu, Error **= errp) =20 /* Additional dependencies not covered by kvm_hyperv_properties[] */ if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC) && - !cpu->hyperv_synic_kvm_only && !hyperv_feat_enabled(cpu, HYPERV_FEAT_VPINDEX)) { error_setg(errp, "Hyper-V %s requires Hyper-V %s", kvm_hyperv_properties[HYPERV_FEAT_SYNIC].desc, @@ -1608,8 +1604,7 @@ static int hyperv_fill_cpuids(CPUState *cs, c->eax |=3D HV_HYPERCALL_AVAILABLE; =20 /* SynIC and Vmbus devices require messages/signals hypercalls */ - if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC) && - !cpu->hyperv_synic_kvm_only) { + if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { c->ebx |=3D HV_POST_MESSAGES | HV_SIGNAL_EVENTS; } =20 @@ -1752,16 +1747,14 @@ static int hyperv_init_vcpu(X86CPU *cpu) } =20 if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { - uint32_t synic_cap =3D cpu->hyperv_synic_kvm_only ? - KVM_CAP_HYPERV_SYNIC : KVM_CAP_HYPERV_SYNIC2; - ret =3D kvm_vcpu_enable_cap(cs, synic_cap, 0); + ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_SYNIC2, 0); if (ret < 0) { error_report("failed to turn on HyperV SynIC in KVM: %s", strerror(-ret)); return ret; } =20 - if (!cpu->hyperv_synic_kvm_only && !hyperv_is_synic_enabled()) { + if (!hyperv_is_synic_enabled()) { ret =3D hyperv_x86_synic_add(cpu); if (ret < 0) { error_report("failed to create HyperV SynIC: %s", --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009310; cv=none; d=zohomail.com; s=zohoarc; b=Fc/klirmV/q4bi6/0VP/Jq9QUPxnadQngPsKL3Cw7WMbqbmCnpM9ZFpYiJHGYV9m5MQxr0fSzDfm/G5FfNDCdTkusQb0/kibADI4MGqCf8cg3UAmGkmp8L4HSH9zGIRrBUo+9REcdnLqmcODEPQXKGDngpSq4+TeLnEByOnEQIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009310; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=x7Yb5EbKwVxfF5zbcjgROKL5ZCps1r9DwcyPOGOHfQA=; b=BAiF2zr0QPkBvIvXVOsjUjnedpC1AAPKuuatS118gsnSZ3itS8x+vlUM7cJgvEIc6NWWpwKvKiqVxnXdr37c3aLADhh+a3OBjR7F85O1rDj7BuG26/dlKafTBp6RDYgaWNF8KtSaXbP24bbowzhgSWhZYoytZ75EBdAbrST8fbw= 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 1773009310656595.2902823595385; Sun, 8 Mar 2026 15:35:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMiL-0007pB-8D; Sun, 08 Mar 2026 18:35:09 -0400 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 1vzMiJ-0007mg-MI for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:07 -0400 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 1vzMiI-0003Fi-6f for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:07 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4806cc07ce7so127842345e9.1 for ; Sun, 08 Mar 2026 15:35:05 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fae00absm290082365e9.4.2026.03.08.15.35.02 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009304; x=1773614104; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=x7Yb5EbKwVxfF5zbcjgROKL5ZCps1r9DwcyPOGOHfQA=; b=hdAguXal8kI+1WZ4vxy7Wl1CF6HIJwszAruHY4wlWWTt+9Ley+Ig6B/vkfsLVNomPN IOc+Fv/h1l0NVlfw2UTk1avHpOlGWEVCeL8lfN1H5HXIORxKKUoLFTAM8AumDzdFG0O2 AqtRrbEp1RS58NbhjzlhCpIhQBScm/fg3XudlKLIgRoy4+kG2mzw8Ggl5vXCCFwoQWy2 IwCmzDx+zbH4jFnsNDYTtcDDFFQt2iP95PUN0QPHSAhIFNRpG6Fql6e4Dq0HnOoLrNu6 2CuFwPwk45uijoDPrByXcxt9nEl/LuY2BizC/YWpgvsiE0RsB3htvkdtJmbdSyR6jBV7 nTAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009304; x=1773614104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=x7Yb5EbKwVxfF5zbcjgROKL5ZCps1r9DwcyPOGOHfQA=; b=N9SFFWcY8I7L/e8osGAJaLWdbmHthu70qOGFSrLwx9m0VBQ211QomcTZve2UnhAdb2 EZZwN9BRmPfGNiN5K68Xtbg2p0NEX30bJB0mg1uAkTJaul0vCMjd+PioMRzYi6UjdCOR lFyHWUm57enSkH7gGrBMMsK+u6MDkLMVqoGG0kMbype/Zk+BsS1oKur0F4JwhIrqNMV7 F5/Tz1sQdchq4GkU0m7eA9HUDcDnwkjOZ2IFT/Q6ljIv2KUUu2LKKnwC8EbYpVY0cQWx yKF5FRuG/lHGtRn6P6tazBsImMoa099/dLxFOVKeb0yld9c7Y08PKdCj9bynhVa7A0Yc QeTA== X-Gm-Message-State: AOJu0YxNihxO7vJMkBKQ6qY4YIgMNzJpfHOhoehjI9EjUygjxcpEXdyp J0oHCb3uZaBWkJNEHhVM2NRQdfz3Xc0aEKfoKJiYKjOEBm0I/00UTKJgEJhvm3B1g6zfU9ltWv+ 2dyNEcdU= X-Gm-Gg: ATEYQzzDS4s/HUy1JbjKu+vndXJKoXgdqVzdqBjFkV0T0yr833+wbLNxk7XwVeil0zx wrk9r66DhOKge4mCSpWfEZPQNpTgUy4aVXxU6W9VDNPFTDpr91gYGdlHEq6VkoNjN/giZzeZfB8 2SHfHJ2Sq1YKLsCbCqXXZotF5tqWwjePdXAXKUEsS/B/9XISiYLKIBr+sNHhhCthVar3NW2jvah hO3DTti7oOKNzQN17U2+7c3S3Y2XIFaMxXPn/cQLy6+m33HGdAVGb28hJARJd2WfB9g1sucsQMh z7FZZsZqj8gUxAaygoWB7wytH4n/pA/jffry99wKF+wvVHMIRJanxr17+S0UJMI7mjBuL6Z2TDW Bg6GDE2UoaKYN5h4fqhcfXEZfpd5jH/djnZYJKXMQyXZpbu4WtO32ovsQSC9E+2pOw51A/8IUmy amCMP/hS3s11NPd8mfVbGvYb6TkfdlJ+dp6WOSOcMaSvQ8mDQ0vk/vUKrR3nvrYdKLGIwqJ+4c4 K9y9g== X-Received: by 2002:a05:600c:45d1:b0:480:4a90:1b06 with SMTP id 5b1f17b1804b1-48526978962mr157970345e9.34.1773009304029; Sun, 08 Mar 2026 15:35:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/49] hw/core/machine: Remove the hw_compat_3_0[] array Date: Sun, 8 Mar 2026 23:33:48 +0100 Message-ID: <20260308223433.25503-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009312828158500 The hw_compat_3_0[] array was only used by the pc-q35-3.0 and pc-i440fx-3.0 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307150042.78030-5-philmd@linaro.org> --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index f4ee68bbea5..9ad2a7d5c97 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -871,7 +871,4 @@ extern const size_t hw_compat_4_0_len; extern GlobalProperty hw_compat_3_1[]; extern const size_t hw_compat_3_1_len; =20 -extern GlobalProperty hw_compat_3_0[]; -extern const size_t hw_compat_3_0_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 4770618b559..162600425b0 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -238,9 +238,6 @@ GlobalProperty hw_compat_3_1[] =3D { }; const size_t hw_compat_3_1_len =3D G_N_ELEMENTS(hw_compat_3_1); =20 -GlobalProperty hw_compat_3_0[] =3D {}; -const size_t hw_compat_3_0_len =3D G_N_ELEMENTS(hw_compat_3_0); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009342; cv=none; d=zohomail.com; s=zohoarc; b=hWBLeinGe3zbRC+1JlP4yUuZ8bQvvG+D5iEBeya1gsAXkcwv+ZItxo7xWYMFJ7hsySUrTOjCFoyc24CnhBesVeF+DBnl9zSRlHgvCaGOB0GGIDidH9xL/9VXhVEKuzFEyhF3K/eG4t2BPst/qwiLZ1WugFoV1nuy86jVUa6uzek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009342; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=OzEr0Nd2AyO6RB9wHjs1m98fsLiXBTjIk06FoEIBMxQ=; b=I5NpEDYAy3kRAgEATBfQaA/USrahV43CvVDrE0iTf4v0ravXh0H6kCY9HO6Fl7AekvK4xVAZsNXnocKi3VrSa7jTFZHqJC6sT0XiUEtjdwDtwkmB+69cQboH7jc6uhvGRqF/GlwQKyvt0o03eoxdJHtK4hwGMj5uHvS4Gtqsg40= 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 1773009342654640.8070708786368; Sun, 8 Mar 2026 15:35:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMiS-00080X-0W; Sun, 08 Mar 2026 18:35:16 -0400 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 1vzMiQ-0007yi-2G for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:14 -0400 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 1vzMiO-0003GO-IC for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:13 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-480706554beso122859705e9.1 for ; Sun, 08 Mar 2026 15:35:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad1cb7csm21405961f8f.0.2026.03.08.15.35.09 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009310; x=1773614110; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OzEr0Nd2AyO6RB9wHjs1m98fsLiXBTjIk06FoEIBMxQ=; b=DqM20ATmLG8midKcuwcipAKfjKpnrYjpf++MXbI4En91I89tftjR/kraafOetkEFb8 8GXsZnfJQY3ZlsfmhRSowJWgU5JOH3Sj73BWx9Yj7ttY3FqUKBy6Mh4LRAB6+5l0HMNU N7HbEXxxoH/DdrSed6+D6rvdmROLMv96BM9Ws3mLSNNdxxyeFSl9qYPhn0Nda1v7BNGt futf3iSR2SdZjQxBA9e1bpm1R7C1omjZX+4oEh1XjzvKWVIfhhSLrdhHgsaV7D22Fp1h OodgFjVrqtFrfzlaaPgYt0wWt/qNCf8rU7QAws55tWJ41tjNN7tJzA/nVj2NCnKyxk5J I4bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009310; x=1773614110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OzEr0Nd2AyO6RB9wHjs1m98fsLiXBTjIk06FoEIBMxQ=; b=S0htbsDpulMWeeljGyuQ9UDmf/Fjt0fVRFZIujpTs6wuqGlwyl9p3SLed+jXvtvMKR W/Xj3pfdEN6onOy3yDLUi29SK92YxqGwIV/cDwov3FE1RDB2DF7btHjbyzTaeN0BTLZK 4oheY4FqT0kr+X81oFH9asHJfs0H45/aJK6lQOJO7i4uN3wZpkFSUiEdWUoEZeUzOqaH 3w0QFnD4KtTd61gc5ieWTEmjoE5CKlxJwVjDRvCI0oxySE/Emck9w+g9lLCj0JSpxqht 60/FLSyN1nxu9MoBvqWgQm/hH2hK1dOVd6vjYl8hJpw+K6dyfwG9hbSRzquqYd7cdAqF mLmg== X-Gm-Message-State: AOJu0YzoQ8OkXObIpgC3Ir27JrerhQXvebNRt2UE+oSiiyPD4Mn0XTcf VKwwKmEqurgCi8bNG8x4R+Llbm8z5QaUwCZzq299ierxqoIKuGUlpXwLCeOXaw0YQ3wPmUD2tnw OjXJEa3g= X-Gm-Gg: ATEYQzzCX+ak/DDWOnDBsSDVcbok8nnCCMXSIA59Vb5CWklkoKFakA9kZJ/VeeguvFO 6p7E1wI0WjCt+zTWNSWsAcg5dONXNa0V2qfq9DccKdvVJHjrsDnfa8SUCSo+O8MjLue7l/IkVvZ b6ckNvJHof2EwDwBC4Gei3Jtz9rmdHw/nzuxwQr5KGyVbSdIBPUz9jG8Hf+/isn9AiTcqGyEYWX RSSPvU2FQh/scqztc+XuOVGvTD5S/iV8vHghePUNzKHXFCk6mXrIZHqmP0qUlXainHS1UWvXkBJ lik1HfbE/zlnuw2KNxH4Il0g6mEniBv9P86bSloZinS+PmlvwvtWpTG9pivP07szINuSBrgjaOU elepJhnt0lChS9K18eOR5P4hQ6gtETtmBzSOwALajndaoE/xwMmI8vvVMQ9HDS/Gdmll4H8nXUX gF4rqvGCcjveshA7B4mrhg3An3Mt958aezsvW60V9pj0dEREOlv2cr8HNFxbkl/0K7rCak0s2ZS GiJwQ== X-Received: by 2002:a05:600c:3b8e:b0:485:35a4:939c with SMTP id 5b1f17b1804b1-48535a4a188mr61363785e9.29.1773009310524; Sun, 08 Mar 2026 15:35:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/49] meson: Include various directories providing stubs before libqemuutil Date: Sun, 8 Mar 2026 23:33:49 +0100 Message-ID: <20260308223433.25503-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009343633154100 Stubs are provided by libqemuutil. We want to use the generic meson machinery to provide stubs once, instead of per sub-directories. Move the 'subdir' calls earlier so when these directories are processed they can add units to the global stub_ss[] source set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Message-Id: <20260225035739.42848-2-philmd@linaro.org> --- meson.build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 0029c970b08..102f0cbb13e 100644 --- a/meson.build +++ b/meson.build @@ -3754,6 +3754,14 @@ subdir('authz') subdir('crypto') subdir('ui') subdir('gdbstub') +subdir('semihosting') +subdir('audio') +subdir('io') +subdir('chardev') +subdir('fsdev') +subdir('dump') +subdir('accel') + if have_system subdir('hw') else @@ -3799,12 +3807,6 @@ if have_system or have_user subdir('target') endif =20 -subdir('audio') -subdir('io') -subdir('chardev') -subdir('fsdev') -subdir('dump') - if have_block block_ss.add(files( 'block.c', @@ -3874,11 +3876,9 @@ subdir('migration') subdir('monitor') subdir('net') subdir('replay') -subdir('semihosting') subdir('stats') subdir('tcg') subdir('fpu') -subdir('accel') subdir('plugins') subdir('ebpf') =20 --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009327; cv=none; d=zohomail.com; s=zohoarc; b=UH8Lkq2Abov6SGa+FiM925syqfAP0pv8/VeMT/BnhqZYud+2x9ovWXEI8Bd+xJe4Gy3W9NK5F4C/zG09yHGw5CeVFx19KOVmHsrPdSlaYWVUBOWOCxh7J4p1kqEZHM5BBeK+HdVgZqJQPLYgDHoh1i6sv5wha/YJGf7qSOQGkTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009327; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=+1VocN7MgnHEJhNLZV4eiwgA4lPII4YDTKWegM5dUPs=; b=jM/M88Hv0arrA3fUKh+CABB9ZzB3VerXZIbk4y1pHwO+k6L+1v728+Cn3FxOptr5I/Hv/+e91oHGFokCS7+7c4Wg5jJ1b80Dhu3qSxV8iM8fLsv2S8nqaU4seYlppK1tbs59iFJdH2YPaS5+cHgFljN512IEB/z3nZT6O7x6XHs= 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 1773009327576249.99365331193917; Sun, 8 Mar 2026 15:35:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMiY-0008FX-Bd; Sun, 08 Mar 2026 18:35:22 -0400 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 1vzMiW-0008AC-M4 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:20 -0400 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 1vzMiU-0003Gv-Uo for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:20 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-48538c5956bso5611495e9.0 for ; Sun, 08 Mar 2026 15:35:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852e38c013sm282604645e9.8.2026.03.08.15.35.16 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009317; x=1773614117; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+1VocN7MgnHEJhNLZV4eiwgA4lPII4YDTKWegM5dUPs=; b=vyMWw83E7bfZduK+dyKrxQMRwCNF+ciUWVpCYa3b/hohyqjk6PcqG4xqJslnP4UcxZ 3pODrzYfffVuGlTYvI3Pk7J+NUK2CeXNA+kK3/KWiZBUPjaDleeT6ggiV5lSMilJxMwE R/nLP4No/bmzCbIySuvPUVIhNgqD8lEcGRvI0DN1vEPSYeiBrMeB61mBaoyQLg2hBc+y GWFVao2+62RJRmimriA+LEuLGxP5rsRRvz0xG9XaysdxSvxZ7u6P8tyNiZHcc3ZHEGos LLDvWxLaBPnPNZH0yU6y0CNU8XLREaYebynUilMAb459Wem+V16O9nGui1CkTcn3wFXs 81kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009317; x=1773614117; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+1VocN7MgnHEJhNLZV4eiwgA4lPII4YDTKWegM5dUPs=; b=QLvO6LGCDOVQvhxAoDUJkI+TBYGNgG+07Yhrtag1XfYEtDhUNTLk4uSaeWsZgsz5Nz qsTZEZNatfCVHi3NrQXmS2OoPpyD9+uPxrgY6bgas+KIPFvC+OUrjIq/TfvVjPkBPhqz wx/vvtFRqwBTp1HXJmtddaWgOWoMga7b0ncWcGmi6HVc/nhSDpJ/b3Rsw6TtP3RueiMt koVGz1J8xqm0pPX6rEZUMjKMsFmpVOXxpSzDOCcBTYYzm6plmNWB4C9FcbBfBA/sC6IB vUnog5nvf1x6WqW8OdIBq+dqKXnWg4Y8mB4UOHwSmRAwy7KuzoGC+no0Wqvhu6PO36Xs DIzQ== X-Gm-Message-State: AOJu0Yx7Xgtp3Mn5NvWD6HT+iJ7ys2Ots8+Cjay6qbg8rNhGqcwkxbvV NY79bZV9z1Ge5mI09LZtJfAGxXT7cVMJfl7gAhgGv1dtUnO/OS4YZZ3Sk1TrwV0q2rozOE2P+tN 4xfoCjKQ= X-Gm-Gg: ATEYQzwouEhVQy7+FMAHwbOH768631kzNA8+IIwfbjJqUEeVhaetAvzDuKEYUfH3urM 3GTnVGqhNeUWvCwKB2/EiJ5xtzJcou5wgkapvoY5oHhbl6R2GN1p1JPQ+GoGCLBbeHm2psDMhgQ PK4h8NQc0joghiXnwodhkdxY+2yR4jkP9Ga79tbspY9qOS6iu/IOMCeUjduxJ7uuC+5QCqK77FF K/Fg8TkE1QWZkD+K7Mpy4ARQKyFo6ko2n/MKVonHBb+8ncTRchZyXG3Lkls9IS30UPkdaJipuea d/fYySO60VLsk0Xg8wfpcsgJJB9q1z9mR0eYGZBRoFyN9SA2xjBB/yhZ8WqNRoVKJ8W/jgUk2K7 94CL+9mCa4JXu3PRwPnt+cEq82MREwZsGk64cSYdBfWBTxlsVcOAzLnOd/kM92FkSFlKOCi75ot F7+HO2EbY7kN6gm3/7tlHGAqlTQjrvAeLTcvyNks1nQvoid6Lec0wkQwKYu8L4rpAsqWI1bJItO 88tJg== X-Received: by 2002:a05:600c:19c9:b0:485:3b33:f4b6 with SMTP id 5b1f17b1804b1-4853b33f723mr25815545e9.0.1773009316954; Sun, 08 Mar 2026 15:35:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/49] hw/acpi: Move acpi_send_event() function out of acpi_interface.c Date: Sun, 8 Mar 2026 23:33:50 +0100 Message-ID: <20260308223433.25503-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009328819158500 acpi_interface.c should only register QOM interfaces. Move the acpi_send_event() function to core.c with the other event handlers, and its declaration in 'hw/acpi/acpi.h'. Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Igor Mammedov Message-Id: <20260225035739.42848-3-philmd@linaro.org> --- include/hw/acpi/acpi.h | 1 + include/hw/acpi/acpi_dev_interface.h | 2 -- hw/acpi/acpi_interface.c | 9 --------- hw/acpi/core.c | 10 ++++++++++ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index b036116dfb8..dc3672db521 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -182,6 +182,7 @@ void acpi_gpe_reset(ACPIREGS *ar); void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val); uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr); =20 +void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event); void acpi_send_gpe_event(ACPIREGS *ar, qemu_irq irq, AcpiEventStatusBits status); =20 diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_de= v_interface.h index 5927e40eaff..65debb90a8d 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -27,8 +27,6 @@ DECLARE_CLASS_CHECKERS(AcpiDeviceIfClass, ACPI_DEVICE_IF, =20 typedef struct AcpiDeviceIf AcpiDeviceIf; =20 -void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event); - /** * AcpiDeviceIfClass: * diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c index 8637ff18fca..e58e8aaee23 100644 --- a/hw/acpi/acpi_interface.c +++ b/hw/acpi/acpi_interface.c @@ -4,15 +4,6 @@ #include "qemu/module.h" #include "qemu/queue.h" =20 -void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event) -{ - AcpiDeviceIfClass *adevc =3D ACPI_DEVICE_IF_GET_CLASS(dev); - if (adevc->send_event) { - AcpiDeviceIf *adev =3D ACPI_DEVICE_IF(dev); - adevc->send_event(adev, event); - } -} - void qbus_build_aml(BusState *bus, Aml *scope) { BusChild *kid; diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 6b65e587f2a..a6a62a742d1 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/acpi_dev_interface.h" #include "hw/nvram/fw_cfg.h" #include "qemu/config-file.h" #include "qapi/error.h" @@ -753,3 +754,12 @@ void acpi_update_sci(ACPIREGS *regs, qemu_irq irq) (regs->pm1.evt.en & ACPI_BITMASK_TIMER_ENABLE) && !(pm1a_sts & ACPI_BITMASK_TIMER_STATUS)); } + +void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event) +{ + AcpiDeviceIfClass *adevc =3D ACPI_DEVICE_IF_GET_CLASS(dev); + if (adevc->send_event) { + AcpiDeviceIf *adev =3D ACPI_DEVICE_IF(dev); + adevc->send_event(adev, event); + } +} --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009335; cv=none; d=zohomail.com; s=zohoarc; b=fFz8cL/+buaObRD3uGcuaFPJsdO25rTzYpiihrl0rjlHYseX6KeEfBPV9PingAXjd+J+R3/Xjndoy4jrh4noH9wtciE/0WSx4EGlKkVKVHWHOw0bgQ0JL7GFnP8H77IwakUEXphLIRRy7+3GJXhluj/DwEmEYdRO9cHypzrw6ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009335; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=gpF+bC5Rqb9mt+abFwuopRjwAKXmFMYfU92epuLAv0Q=; b=F49wh4F6hsOQnNbbHw5jW8abVpBX0co44n1WrTyNHzsqE8Ryxp/Xke6x1LU7XTue+8/Zh4rRdtoQsr5Ag2IG3MTaWlNRoCFjZvKdGUgwNGOSTUnB+yXNfvzSKUJrhvRt2ysWuqb4NgeAwjGX5YFzHXqRnDNezIj7LvlTHe7yWoQ= 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 1773009335102780.3077098601866; Sun, 8 Mar 2026 15:35:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMie-0000HJ-Ho; Sun, 08 Mar 2026 18:35:28 -0400 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 1vzMid-0000Eb-Cs for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:27 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMib-0003H9-O4 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:27 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4853aec185aso3084565e9.1 for ; Sun, 08 Mar 2026 15:35:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852687c1ecsm124430155e9.1.2026.03.08.15.35.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009324; x=1773614124; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gpF+bC5Rqb9mt+abFwuopRjwAKXmFMYfU92epuLAv0Q=; b=jX+20VCSKmiTp2vmuAviFr9qx5AHXHJz8/eAh307NIwZtx5Pe7S+/dXPxrxNuTcv2v qEpCq+1THefHBS6m/QDobcuigCIcN7i6vesjeZveONEtZitbnwP3tmp4XbVt+3Gs/cx7 Cdwg6G0TAAsVxvk8ZuCQYps1qIrIG/o2Yd6TPpPA/zBQdF9BKNnqi/iyzt6jmp00Qm/L f+M8qST8WbNLFFes876wuVhO4pINdEmGvdPUTyWMmRYFkXhQoru92lxvDzwI7JR7wwDj QjmXK/Gtn8Hmc+y3HQKC38wEGguTZRvtY9GqDLlwPxN6/H2Cr4r83yC2eojelZKug85v swOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009324; x=1773614124; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=gpF+bC5Rqb9mt+abFwuopRjwAKXmFMYfU92epuLAv0Q=; b=wl4s5OWjo91EsvK9Ecr0zBjcnWE+oTo4I/S2wkx9rqzvN8MPdgQzuOgix+a+AqqfMg 5391apqYqZdOguicHpGob7gvgsPO+VWFXNJcRSNxQjDYlKEmbhlG1MSNqVm91NXB2eiu ird2Fp09kswzgWgZ4nbFiTVNwPD1EYspwJZsTbBPgvWKLG2wnf+JAeWL8vjkQpaGcb12 KxbtYh8MAE2lffCGRcMQAix50Zi0x7tpDjQiGs/uLdNsCwZb0WTln9WRKj/CshX1AUh6 tdAMSLUzH1QVu3H0Z0qxacLyn588bPuHfv3cWNZezMjf1khwXXIhK5Z9C7mKFfKmzDTw g2Qw== X-Gm-Message-State: AOJu0YySudPgyWhy95DbuyCNQ0/de0uhFtr+QF0Y1kB1I+bBXh7/YgPl oqeBPxVvqBJH+Z91uttg+ARjtDca0bzXg3c1Kmvly89Bw4dhmh/efdUydEohFnQ0NmONHrqD6x/ 1V53jlhA= X-Gm-Gg: ATEYQzyVzWltBqXX/wzZYCkl5sHBn3EO532+BljvhXhXoD7vAtLUDfzC8kKExX18T/S MkmO51ghZBn7HK9lZUzkWLfsgMy+HCfLA2dHHicb1aokKQipFTLHk7IX/Two2XH9SfIwUBMkk7o cEFEwwJjv7gfFxOqvXtQHP0rpxAUTclsCoZKtSo475hInS6M5YoLtF0Jb5B40RgP2UpHBlZPvAl 5zsG3JtkwBMOm6492APq6KXeqNQK6wdj/KH0wel7kabCv5VaYBYvL4s59h5FhaCxLWNkEcX0Cmb O/FdMPAsmGzY1aNBP1hSJHOzidU8iy8mk817cT1dhJEzvrg0DsQavUls422KmYPWcLdf+13E6Vt YRAJ7wZAWZ15cZULldW5SCkQNTZZae0sbe+ly8gENnn0RG8DaVpOTnwXz4gIq/JiYGdNiEddHtd m6H04La8VCcOuMlM0fFYY3gXoFgYa/2nDZNdTOnDgEV8FaoxMYG3HRXl1NnWb9/KOQ6H6pV/tWz jaOWQ== X-Received: by 2002:a05:600c:8218:b0:485:3692:e8f7 with SMTP id 5b1f17b1804b1-4853692eaf6mr47314675e9.25.1773009323698; Sun, 08 Mar 2026 15:35:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/49] hw/acpi: Move qbus_build_aml() function out of acpi_interface.c Date: Sun, 8 Mar 2026 23:33:51 +0100 Message-ID: <20260308223433.25503-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009336983158500 acpi_interface.c should only register QOM interfaces. Move the qbus_build_aml() function to aml-build.c with the other AML build-related helpers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Igor Mammedov Message-Id: <20260225035739.42848-4-philmd@linaro.org> --- hw/acpi/acpi_interface.c | 10 ---------- hw/acpi/aml-build.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c index e58e8aaee23..a44679017ea 100644 --- a/hw/acpi/acpi_interface.c +++ b/hw/acpi/acpi_interface.c @@ -2,16 +2,6 @@ #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/acpi_aml_interface.h" #include "qemu/module.h" -#include "qemu/queue.h" - -void qbus_build_aml(BusState *bus, Aml *scope) -{ - BusChild *kid; - - QTAILQ_FOREACH(kid, &bus->children, sibling) { - call_dev_aml_func(DEVICE(kid->child), scope); - } -} =20 static void register_types(void) { diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index ea1c415b211..4b374050881 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -25,12 +25,14 @@ #include "hw/acpi/acpi.h" #include "qemu/bswap.h" #include "qemu/bitops.h" +#include "qemu/queue.h" #include "system/numa.h" #include "hw/core/boards.h" #include "hw/acpi/tpm.h" #include "hw/pci/pci_host.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_bridge.h" +#include "hw/acpi/acpi_aml_interface.h" #include "qemu/cutils.h" =20 static GArray *build_alloc_array(void) @@ -2647,3 +2649,12 @@ Aml *aml_error_device(void) =20 return dev; } + +void qbus_build_aml(BusState *bus, Aml *scope) +{ + BusChild *kid; + + QTAILQ_FOREACH(kid, &bus->children, sibling) { + call_dev_aml_func(DEVICE(kid->child), scope); + } +} --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009343; cv=none; d=zohomail.com; s=zohoarc; b=PX7BvnCt1bFHZOcVn5JF25wHNK+OqMYJPGRGLqK6S7vaKLb5QHj0Qt7wmqjjl0DRWQDDa6NpT7q9Cb3Ewf+5hP5weyHQ6X96fTxMavVF9BoBouVk0TWLZugvSwXNKmwSJjcQVcHG9v32QZef2LEi0Ztpfj7c7g2UIFn1PJRcUKE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009343; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XM9jeNcCgTiWmoXI2IRnHd+zaADJdT6x62UupLcOabs=; b=Brci4Yd8DD6VIUEO5s2Hb8vdJRSt1wxzDvuN+1JbfLGDHtvZWaMgCOb1f0OvGwpwyMpsXuF4fEHtKbHoTYBgmXJ1T+3S70TctoYfjGcwmuOonYYZOYesQLYKFubqnMcpJSAdXxoA+kpjSCh4N/6siKqaKgpTdczMndPMv2euO1Q= 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 1773009343824314.27368391249354; Sun, 8 Mar 2026 15:35:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMim-0000iD-Ov; Sun, 08 Mar 2026 18:35:36 -0400 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 1vzMik-0000Vr-AJ for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:34 -0400 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 1vzMii-0003HR-Ll for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:34 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-439b94a19fdso6875169f8f.0 for ; Sun, 08 Mar 2026 15:35:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae49177sm21015655f8f.35.2026.03.08.15.35.29 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009330; x=1773614130; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XM9jeNcCgTiWmoXI2IRnHd+zaADJdT6x62UupLcOabs=; b=d9VL+W/UZhbJanCqsseEFP9CGgXDK/G5SJiNpW0ynxr+94SMlv4raFz72rz5Q+8z86 kjE0Vz7ktTQiQx3cPpVTbLRhyvKaVdGqNEMhmBp8m+YtCDcv5C+dSkznvDrw/1YUAZxk 1JoaVO4Veml08ZnsdUZpZOiGpuqq2FhbCELJhVze7OT5HO/VNn1lCXwU8cJBsQzy8k24 gHpZ6/irOT93DJP4a7qt0E2TZh1zSe/ghn3SpS4c/FGlsAYUGy6/8tdnGfuy2j1h7TB0 z5U6C4Js8WYYVQqUbGb13h68NZQvkRlXEU/gNx95TuySbZsb1GMzTfBhAk56SoTdnEZR vVOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009330; x=1773614130; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XM9jeNcCgTiWmoXI2IRnHd+zaADJdT6x62UupLcOabs=; b=igni1m/TDkQOET3jTsC7CDwwMkbsbCvdZOF6KXZH8l4QuKlNcpbBKGZw+44YuVMxlq KlivyZG9lwL9IqBBw5HYyTpNnopm22IwFcxZyWLyOj/jLxBH9gvVUFre7LyDycvE5jD0 zpDznGQb1xTqnlbkc3aWf7B9GN+XxGb/emPNKNLfSgm94kMuOxww/c0crQxflai9dPF8 wW55hZHuHjWRnJNec418kYMfpPef+R1bJOn12PztEKaHqvUF7xK/edXeDTXULwKDcegz qA7jnzhZwcYhZlUE3grbq8TvGmpAougdr7CPJWVfzBRwTBtA/WuH+kb8mdRCFIwcnjWk QXww== X-Gm-Message-State: AOJu0YyoYOMgcmGBYLBHfVcTPyCqTPdG8L0PiK3f+On+lpGDZk0hqivN GU6jcEwFDqTfhoCcGheTox2oVVQhXs50HYNlPg8stf5ylJeNDJ2PHINadMlqYEa6RHE48VPSO0v Bl+9uyJM= X-Gm-Gg: ATEYQzyAP+yhCiGT5+CKimb//zv/FFmpm+UmZvZXv6fult3w+abfoSf7WhGwrPxGd2O PMusoNQXRzMCLmHUXMivJi/pEVxufLTs3zqLo7yhf+P1+QfPHkuzNJKrvwhB5WiAbAeC7gcK84k 6pQiJIlNM7kIMLFRgCqMfvnzwvLeKooxD13B8NTAoiMQbTd/YiX2me1gaBlZPUXpHjZ1FOEh5zC IGJgg1GP9qDEQMvQTGrRicuY93eaAQdiQ7ZDJob0wz4FnbwZrt8PYSHIJ/a/lrV1Nxv5CpcRcVn jyE2cqZE+2NbkzwOGUM5kc78/9cDjKfJat0Fhv2lF01588q856hFgZoA4gwk10TZvRtzIqq0B+I OiFtv+X4jvFxdv3NqlJV44VIgDTRLDvkFzBxKYvQkTBywj7pDrJAOoYGqE2WzM/eu2jR6/1bSJu 7cL/hv83Mv81Xb8xD26YxFyvaAv0gmqOlSPGbmFkHq4TsrSeI/Qze3myW+0w6kPlQyCNL1v3ziO HuVQg== X-Received: by 2002:a05:6000:2388:b0:439:c1f4:302a with SMTP id ffacd0b85a97d-439da6543efmr16297624f8f.11.1773009330183; Sun, 08 Mar 2026 15:35:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/49] hw/acpi: Always link QOM interfaces with system binaries Date: Sun, 8 Mar 2026 23:33:52 +0100 Message-ID: <20260308223433.25503-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009345430154100 Now that acpi_interface.c only contains QOM interfaces, unconditionally link it with system binaries, regardless of whether CONFIG_ACPI is set or not. It is now easier to deselect hardware models depending on ACPI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Igor Mammedov Message-Id: <20260225035739.42848-5-philmd@linaro.org> --- hw/acpi/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index 66c978aae83..e1e848327b9 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -1,6 +1,5 @@ acpi_ss =3D ss.source_set() acpi_ss.add(files( - 'acpi_interface.c', 'aml-build.c', 'bios-linker-loader.c', 'core.c', @@ -36,4 +35,4 @@ system_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: f= iles('pci-bridge-stub.c system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) system_ss.add(when: 'CONFIG_GHES_CPER', if_true: files('ghes_cper.c')) system_ss.add(when: 'CONFIG_GHES_CPER', if_false: files('ghes_cper_stub.c'= )) -system_ss.add(files('acpi-qmp-cmds.c')) +system_ss.add(files('acpi-qmp-cmds.c', 'acpi_interface.c')) --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009354; cv=none; d=zohomail.com; s=zohoarc; b=fiKBoiZtH4eMPe708emBok9iAzWpBru34XT5IC3YO049xECq7Qeg7ygStDHaXJzNSznD6TJsyQWC//XEzdO8DcB9ytE9WriFk9EwNVLs3aslHXsojRCtVvnR6dMPLYoTzU3fxgAm5ECiRTr//vBLwQBJ3qZVAijJXWvR/UrxrOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009354; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=MMwZN0BcCTHOYyyZ2QrOvcZPtu+WjOgZ4MJuxAH7NMI=; b=ihvONtOb/M23Xd6RPYXhIm58/4OXN3+T7hwK1e5pFiFNmMMJgtweCdXYweaeWaKLN8s92iQ0djN4ZEzgl17cdkpZR1sYNji1c/km4n9noNf4bqDHhAcRbLbLbbLpVihBjRLz6UKjoxbk4VuXBfSrvYrZG+ZEXlTYE0Gl9Db7QmI= 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 1773009354552348.4004684610587; Sun, 8 Mar 2026 15:35:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMis-0001NF-HE; Sun, 08 Mar 2026 18:35:42 -0400 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 1vzMiq-0001DN-CB for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:40 -0400 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 1vzMio-0003Ht-Pn for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:40 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4806f3fc50bso120488775e9.0 for ; Sun, 08 Mar 2026 15:35:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dadb29fdsm21709164f8f.16.2026.03.08.15.35.36 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009337; x=1773614137; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MMwZN0BcCTHOYyyZ2QrOvcZPtu+WjOgZ4MJuxAH7NMI=; b=I03uV8+o5pE9h0Q1WCOa5HFSIba9R3KmOCh9/cG4idvpkAKtONp6OwUvDzwEWdofGn pEWOWJ9+XyMuEaEZ0l9D0eCX5ZQz1ZnPyIdWY/Ft21fEObat64kMUJ9hiyYmDlvOLXdF lwkPqDhJjFmsW3oUs1eX8BQCzHVXU6vvywHTl21PHv5fjsPwsxf/BALOeZzTnv4bKNun 04TkCiPQtRWXqnz3a9B1im6k52h0ivhYcBQ5FnIGQJ0YyXcInRnpPIEU4L/6rGp+I4Z5 3TlSBdW9ny2Y++ftKqY+dLsjbeHozjnm5Lvw+fQ90C4PwL3uydMnioX3nQVfX17lrJ3n MtCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009337; x=1773614137; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=MMwZN0BcCTHOYyyZ2QrOvcZPtu+WjOgZ4MJuxAH7NMI=; b=Fd3Qo54YwLn/l6+b32f1vFgIcYTgS0f8wHolG67GQSUKCyCr0FGwLm8+h3SckQAbgc miB/Hy35o4p8ikSyvok3hs7tCHDcqEkyNgUKV0HSE/ejvHANXjU3RHwzGTw1R9nwPRSJ 17x+XRH/2VJsaIGb5kktFtfILtr8nL7XhSJ/Ei3v7XqZ+D+C/Kf2nCJ3YEletPzLtIWq VV1PczsCqWv3efL5pBior7vmCTm6okBYa2ohId4GaMWAsEZSPQ3QgxsHpyzNFrzZadNd Fs2i9WF7TCXF5YM2MbxGB6A8s6LXrlraNrQH1A4xyGX2uE8LrXHa0p9gwOQPUwygCirD gMoQ== X-Gm-Message-State: AOJu0YxdXge9fdQLa78Vx7Xq6NQ0N1DBzepBIUhcP52GdV+re6uczmVz qG5Qw65E23XdzP5iuGhq76aptw5epBkaQZQG8F126ZCv+0cvkkICBGXu/wqmrdNLaz2qARmpzSy MkTstVQE= X-Gm-Gg: ATEYQzy/2V6aMIgoAKiHQtSJLyVDUPA4nd3WUtakJR37Is9obpRbqqeeSO8FfFV4iDK ipB3bTdIYeKdDc2+LvueaKDKsUOyyWNtkx/ExXT9PaomGkhYGsA+m/HoaeWyYqmKHWfSHIvLR7K 5R7Vo126q5ZRVkaDc1wn+gXY5hqkpILwMAajvFmnFGJkpCcPCDEUPnlKly8Ye7XWojdhuE/2n+0 VXO0OEt9Yqbjh68SyLdQWI86PtF7wSwUejnz04dahexlTGKu61V2qFhX8fNQmyUEksZTj6mtfMe wwK46kKfFn3gUT1sVDhpnogGtq8/OHRBCMiQel6HmtphR63TNKW6mzsRfHz2fElBsXW9fJhE2iJ PH8bo80L3SFhsC5NmL05zG+622D0uC9wlL0hTlmK5qjggvmtTXN3qWnJMV+Eu4YHLn0dIGEUjiz rCa8FNN/zPYBm/Sz/KKrMYQyJfFT1ZjMJ1JQbIigour4R/8bDNYwcGVQmlrCJR0JZjkc9OjTD/Y 7kOH/L7Q5B/0doV X-Received: by 2002:a05:600c:1e86:b0:483:5310:dc67 with SMTP id 5b1f17b1804b1-4852695b81cmr160952495e9.20.1773009336882; Sun, 08 Mar 2026 15:35:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/49] hw/nvram: Build fw_cfg-acpi.c once Date: Sun, 8 Mar 2026 23:33:53 +0100 Message-ID: <20260308223433.25503-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009355873158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Igor Mammedov Message-Id: <20260225035739.42848-6-philmd@linaro.org> --- hw/nvram/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build index b66f23605b7..26343359875 100644 --- a/hw/nvram/meson.build +++ b/hw/nvram/meson.build @@ -18,8 +18,8 @@ system_ss.add(when: 'CONFIG_XLNX_EFUSE_ZYNQMP', if_true: = files( system_ss.add(when: 'CONFIG_XLNX_BBRAM', if_true: files('xlnx-bbram.c')) =20 specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_nvram.c')) -specific_ss.add(when: 'CONFIG_ACPI', if_true: files('fw_cfg-acpi.c')) +system_ss.add(when: 'CONFIG_ACPI', if_true: files('fw_cfg-acpi.c')) =20 system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_otp.c', - )) \ No newline at end of file + )) --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009378; cv=none; d=zohomail.com; s=zohoarc; b=CttleQ9+FvMkUQGRW9jWiyR7E/c+60Oc2CphkUfqvs70y02uzzu6BdE6nwm+l7AujfiVMcBUlLQ+jh39ZQNOQulCijwqjJDv8MXYmR2nxHHcry0/y0sySCcXnh3tkA18BbdyacsII730qmBGsXdUMj83OwilJWpMbcGFTzFHkEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009378; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=gk2rwwBrHZhMQrfODT1MQGRLgxz5V9+zQXEuJZbNKHo=; b=C9SMI3lqqkM+oSPCbi1daVhR9Kk8ByxaxzoVMHwf0iyHddeOM1TfV6sbfkzfdi0RQ8SzGgGrG+ninWPu0VMqGlNswoiKg9NSfqDvhaTMSh6BBWtcd9PcxKWQDzBnrRmHrTph/SC6B60bS6T7tKpKjnEVUZTgz01WMYIui83TDjs= 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 1773009378347690.9237115773076; Sun, 8 Mar 2026 15:36:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMiz-00028o-8G; Sun, 08 Mar 2026 18:35:49 -0400 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 1vzMix-0001zu-MY for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:47 -0400 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 1vzMiv-0003J3-NI for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:47 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso89215865e9.1 for ; Sun, 08 Mar 2026 15:35:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852f6994a1sm114992955e9.9.2026.03.08.15.35.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009344; x=1773614144; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gk2rwwBrHZhMQrfODT1MQGRLgxz5V9+zQXEuJZbNKHo=; b=hP784BWY4babjGWVQj4+/aiy6rqrf5mcGHPxRq/hCOMtOE6JcqWICIFrd9en2HGDv+ ClrwasEwFmJohyvkId5Fzr1da9R00jsaKTeahNZW7UAMw1nxFM4oD0yqibOYAFk3HOL6 CaU0Lc2LgxDbPKjlLAie745eg7ubOI8PrFZ1AzPIzaCIOeFiIEgQ6SOmUPRq/b0l7vxy TQwL8wUdMVEZnY/9J/1J2Yp+vPsDfZpgI6bAu6eReErcVBcPbZOx1FuZ6orgj9P1ZIRb 2obL1iwY+w/eJ+Lt6RwfisjlKnflh9mYPlZtfYQ9Xxi9vCesWyos5//aA7iHRF4N0bDu LakA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009344; x=1773614144; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=gk2rwwBrHZhMQrfODT1MQGRLgxz5V9+zQXEuJZbNKHo=; b=wptoUkUIDOiVFeWFI2ghVR06qytP60MxbcOXBLZmGSaWL2/7Exxf5RZQYdC4s9TTOc KegM7mjHIsRyJTAxqQGhlJlj8nu90B5X9IqNA295G6hcYJiXsVvsf8ihiGUffd9TpLn0 a8RRI+Vk2Sz0JGcZFFjTPQjvTGdl0FTcCM8ndj5OaUkuaa5Ww9VvMYD1wYzkYCbJrBgl 7TIs3g4dAZ7ilYm7tOqGkmA/40UK34mKWqN0UCSIZOHs8hIRee0IP+3nFLVKajoK11wS 5AgU1l2VRRYBf8OukvrBGn8z8RdPi1D/5Y94jOqDibzqdxdH1JXhZD99Hq6rpZFaEPPO F8/A== X-Gm-Message-State: AOJu0Yxv3IM4i+huWpNhxB3BHxfSbFoFdLBrpLZeIXDb9h7/RTAipOeP GB9Ugm9LlkJMcc3E7yRYglz7D1SIGNSqQdEHSCkSnddsDDC/N1War7nMuCjC7UcgIv4W98e4sO/ 9jO4mMds= X-Gm-Gg: ATEYQzw2G9PPdriNIWoNDXpoLA1y5dT0Be6LvLf7uKEQjEeqXtNY/AuqagAurGrMhWc 4824dMSR30o+YFNoeX1Xb7vqvT5ka6acofzmQXLdQ8pNiUdi6gOxE6o9NOrnzKwTdGydZnU+uTV b7fRepSrxXdxqMcy9LJ7LUwgB3a1TVrD8a0SXf0IWAOkzj5MZgoYxM0TDywFd+W+7Jvosqh8z5c G+rq1m7LoKg0ptVczudnMViaexdeBDxB3+E8fw3pm0MUb94VByZtHKfsi54Ghw3d62KMZjqCPwR /oU9OH/8vEDHpUiiQgOyO6laymyjXyAGkKEq75V5RAxd4B/NQk1AOYGH+5r8AmnTgjOat4RJtbt 6k6yNSpl0EAJ5aRrtMZJLnT4pOLYc/LTTu0llpqRm8o7J1Bj/yIegWySRMqPHrT2BCgSjs4dcHs ivi48kFcDBIisT/VRx8J9cxvMmURDU2mkiMqDV5LDJDGFZjcvjwBrET0E0fpOTbVjOdW75AKzK+ BiUPQ== X-Received: by 2002:a05:600c:4f55:b0:485:3c66:e230 with SMTP id 5b1f17b1804b1-4853c66e4eamr10341165e9.29.1773009343560; Sun, 08 Mar 2026 15:35:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/49] hw/acpi: Build stubs once Date: Sun, 8 Mar 2026 23:33:54 +0100 Message-ID: <20260308223433.25503-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009379064158500 Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Igor Mammedov Message-Id: <20260225035739.42848-7-philmd@linaro.org> --- hw/acpi/meson.build | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index e1e848327b9..1c5251909b4 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -6,33 +6,36 @@ acpi_ss.add(files( 'utils.c', )) acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c')) -acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_false: files('acpi-cpu-hot= plug-stub.c')) +stub_ss.add(files('acpi-cpu-hotplug-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_true: files('memory_hot= plug.c')) -acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_false: files('acpi-mem-= hotplug-stub.c')) +stub_ss.add(files('acpi-mem-hotplug-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_true: files('nvdimm.c')) -acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_false: files('acpi-nvdimm-stub.= c')) +stub_ss.add(files('acpi-nvdimm-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c')) -acpi_ss.add(when: 'CONFIG_ACPI_CXL', if_true: files('cxl.c'), if_false: fi= les('cxl-stub.c')) +acpi_ss.add(when: 'CONFIG_ACPI_CXL', if_true: files('cxl.c')) +stub_ss.add(files('cxl-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c')) acpi_ss.add(when: 'CONFIG_ACPI_VMCLOCK', if_true: files('vmclock.c')) acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_= device.c')) acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) -acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: = files('ghes-stub.c')) +acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c')) +stub_ss.add(files('ghes-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c')) acpi_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_true: files('pci-bridge.c')) acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_true: files('pcihp.c')) -acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_false: files('acpi-pci-hotplug-s= tub.c')) +stub_ss.add(files('acpi-pci-hotplug-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_VIOT', if_true: files('viot.c')) acpi_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('ich9.c', 'ich9_tco.c= ', 'ich9_timer.c')) acpi_ss.add(when: 'CONFIG_ACPI_ERST', if_true: files('erst.c')) -acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files= ('ipmi-stub.c')) -acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c')) +acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c')) +stub_ss.add(files('ipmi-stub.c')) +stub_ss.add(files('acpi-x86-stub.c')) if have_tpm acpi_ss.add(files('tpm.c')) endif -system_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-bui= ld-stub.c', 'ghes-stub.c', 'acpi_interface.c')) -system_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-= stub.c')) +stub_ss.add(files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c')) +stub_ss.add(files('pci-bridge-stub.c')) system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) system_ss.add(when: 'CONFIG_GHES_CPER', if_true: files('ghes_cper.c')) -system_ss.add(when: 'CONFIG_GHES_CPER', if_false: files('ghes_cper_stub.c'= )) +stub_ss.add(files('ghes_cper_stub.c')) system_ss.add(files('acpi-qmp-cmds.c', 'acpi_interface.c')) --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009364; cv=none; d=zohomail.com; s=zohoarc; b=FsqUZRMpervVwQVDFuxfv9aNSf+m/qw3q3jcHNpXFFzC+/cQWKAFwT/rwBQfgSKcenfqkqx8zZCxumZiyn2QXyv/raeX+mM+qY6R0bPLHU/xqGN66q09J00pSGwlEDsv6+3BOj0w9XQ0Xk0IhbgtNRB4NI3kBRTWoqzU7/JfnPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009364; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=K5cAnI+aff4g+PK2Wvf2f+7IaZ9nLk9cnyQziXBBI8I=; b=dgvqqN/ueoUfnsSawMQ664xw7p6qAtRB4+lhNedo271edruskIZFBsQ93sy/pUkvdjNSIcTxiTtGOAXezhawmpyBAoKkcWY92kNRmZUuKj1aePEL7cnIIR7FwdOi72HK02XKObNk9+GpEqQdSVejEDELUGZSQTISRAIZXNPRQ8s= 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 1773009364409553.5495714448732; Sun, 8 Mar 2026 15:36:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMj5-0002XU-Nm; Sun, 08 Mar 2026 18:35:55 -0400 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 1vzMj3-0002NX-Nh for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:53 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMj2-0003KO-55 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:35:53 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-439bcec8613so5456569f8f.3 for ; Sun, 08 Mar 2026 15:35:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2ba5bsm19299384f8f.22.2026.03.08.15.35.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009350; x=1773614150; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=K5cAnI+aff4g+PK2Wvf2f+7IaZ9nLk9cnyQziXBBI8I=; b=IHkzipGDqISPdOGVDuOeg4m1WVv4p5C3IQ9lj8WOK+a+QGckyYuMMZEEJL7/P8TNcQ i2iesySfFrYv2vxqweLLwpivWm3xMGtByeNYULeUz0BWjath63sYU0kGxO7DLoEA6oEg 0lFvTdd1SSvrugu7yYf9h+AqGcAXEJPVeWQ68s7W8JnFPKHkYPGsCGLu9nOxWVid4CEB cdb9VoOGpSotoId8d0DKwXImDOFTUrbpFpQX6degAvpgWg5dndoALN7323Glj8+VMD/D tB+5gkArEFuZMN2GMhT9QUdCjM2dQxXwCv718HC1vY3RZQCScqhH4wIlrTw+EqyPp1K7 oVAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009350; x=1773614150; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=K5cAnI+aff4g+PK2Wvf2f+7IaZ9nLk9cnyQziXBBI8I=; b=BwZ2ymgxi24kVkBwmFptXgjNO3FXZS7rybwCXtfGaWFY8bPt/B3GiSmCevps0++V2i NsXGEiRFwi5TUbZNw4L7R3Pv6nj32soRWTr0twvem+G3R4AlBD9p7DAT3PihlB+vDqUh AI4G9A36RfUuv5xROEM78dy3u2hj6ITT35jqrTzh47GZpW4b4bJB+COjjbF4RFTlyEpI TBWxOteks2jAtAlWnslC20r+MntCjE3KaWrBhJakNUShbR8ZITeC1IRMXFwrEdM+VBzc PhwzCO8zO3PRIDdbeci3SNvmZOulBFke1EdZzd5Sli4cExTE0L69YBSMoAe9pbzr7nw2 +azA== X-Gm-Message-State: AOJu0YzvjpR2XVeqIeyXN7/r0P2D87ZN9BzjSXk4zHbMUHTpwAcooEsr Dck1Z7B+h4vgZ9BaySJ3C/rYqW/iYiMxdhsqc3LOlIr0aAg5xXcWwW2isHnWDY1Wc4nsbeJJwR4 rGSXanbw= X-Gm-Gg: ATEYQzzGdERjN1qWKv08uEECnEgmtonWwwZc3HfzzO8jw5GACF4zJea/LN6PIRns8ut FDAzDgYq+g+eo4ABQAkqXC5B7FNq+cOL37FfXyV72NHYdwKE0yyLtsE26E+qahNZTue/8NPzEEV FcVfzP5y+MMwMqQM7aaYtcEPH/950D/vG5ATc9Qv2H5qcV/AinYJkzuWVGco+Hun66ynO+Dal3H XexdIAN1aGWEhxeMY+0tp3Yx/w4SSbYviLYtFdJjTHmg9AQKEAkalyc1v13pzX1bpL1T79dOgod ScigvkYFb/vFsxYtBdMff0NotoN1ZozwXjguskE8+UFqLBl3VIzyeCCtOuldGNBuN2Gg1Tdv9S9 ezB6lzk+bdcuWb2FBj+oSUp/PLvee0YeUVOY2WCyZ5J7srS4NvdUBk0K+a28MxHaabPa4Aj7DSW eKJwvoMq8dDDtXcpsdRdC15TuS8Xmtzni21qY4nextximvpGGvdU8ntlRWErnwQU70l6o/Ul4E+ pKr7ROayGLlKiWq X-Received: by 2002:a05:6000:2c05:b0:439:ad2d:99f7 with SMTP id ffacd0b85a97d-439da669111mr16608269f8f.28.1773009350079; Sun, 08 Mar 2026 15:35:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/49] hw/net: Build stubs once Date: Sun, 8 Mar 2026 23:33:55 +0100 Message-ID: <20260308223433.25503-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1773009366987158500 Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary. qmp-norocker.c only contains stubs, rename it accordingly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Message-Id: <20260225035739.42848-9-philmd@linaro.org> --- hw/net/rocker/{qmp-norocker.c =3D> rocker-stubs.c} | 0 hw/net/meson.build | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename hw/net/rocker/{qmp-norocker.c =3D> rocker-stubs.c} (100%) diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/rocker-stubs.c similarity index 100% rename from hw/net/rocker/qmp-norocker.c rename to hw/net/rocker/rocker-stubs.c diff --git a/hw/net/meson.build b/hw/net/meson.build index bf6a625a92a..31025874699 100644 --- a/hw/net/meson.build +++ b/hw/net/meson.build @@ -66,7 +66,8 @@ system_ss.add(when: 'CONFIG_ROCKER', if_true: files( 'rocker/rocker_fp.c', 'rocker/rocker_of_dpa.c', 'rocker/rocker_world.c', -), if_false: files('rocker/qmp-norocker.c')) +)) +stub_ss.add(files('rocker/rocker-stubs.c')) system_ss.add(files('rocker/rocker-hmp-cmds.c')) =20 subdir('can') --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009366; cv=none; d=zohomail.com; s=zohoarc; b=QWgasmeVhdoDd1l6PQ+KIfmO5pPiur8wulGWlYwTfkTDdSIlydxrP5E5ijQ5yHZSK5R2baGSGx/AtM75vQjf8useNos6kYSdMRk3qER8htuSDOlyKDAslCjgZv13IYFrj/KBWJXmpJuo8vn09K6bJWv2uRADqJhEzVJvpcqEp8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009366; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=IvyubgiZnLR/Qn25dRzLRywypTI2tFXuMoTf+d/sfJE=; b=SJOEt1GkcKGK5cRPvN1CbA5Sd3d5ypAV1ElIfVEiaS/SgIX+FbzMuLi/Kz5g86gAeFgiT9PUsLi/n7oaPPHnVzi7GaYQBqha4Oz6l7T+xo+07E8Jzl1o+yFXCZewmB8HA6XybRmzfYr15hsjaD+rNg9EvU18S3hIsArFJCwRgzQ= 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 17730093667761009.5360569142127; Sun, 8 Mar 2026 15:36:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMjB-0002qa-7w; Sun, 08 Mar 2026 18:36:01 -0400 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 1vzMjA-0002po-Co for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:00 -0400 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 1vzMj8-0003LM-KQ for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:00 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4853510b4f3so10346535e9.0 for ; Sun, 08 Mar 2026 15:35:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8ec97sm23445128f8f.5.2026.03.08.15.35.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:35:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009357; x=1773614157; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IvyubgiZnLR/Qn25dRzLRywypTI2tFXuMoTf+d/sfJE=; b=w1pfytaxVA42oYtx/okkAiV/taGqZdjQw7m8bd8wSnbJMyd4h3IzleW9VNFo8k69+A WsxcSiFIBviDEWY1VFk4N2wULUzxLZmfVuL+iVn2AUhzsLpHkd5alFwR01BbG85bPlLY kx7ZidnbNS9MfEgYmlLx248CYSNyMFPte+uzVYQfN+JjHGvOgHNYrEjgTQdLfBDnwlJZ yBuiR/oMBR6NzBlT88P9RTCcn+LCCawMBaJF/NbphuwVXKC02Wsna64oD/uLPMUCG//l 63zHN2eYHOk9iNA9JDX2LF/GCcTaISBUKWig51uKNdb5lKy8Hnr6M6MWXTNEMlwL1rdA G32g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009357; x=1773614157; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IvyubgiZnLR/Qn25dRzLRywypTI2tFXuMoTf+d/sfJE=; b=f9LGvUx3u1CsWJ6MAMBD5C4EotVYLiDGdFNYAlVWhMadIaIFFInfVtvn0KhL0SCMnR KIqdvE71KZsEVSsOipdKNluY0iSnvRNbmWm6dJUhhb1U1XorLQpj4Gjkind9ERRehvjJ GTNwND8XniqSz0Vbxd41YpYgLCMmxC9/A2jR3fZr9ANMmgB8PEY2FqEGfuUvJj2YePyt vq5hPb61dboO/yKeNUzWeGSZrMd62AeQ9sMhp3gJEzQQlmWNuVp+Eb5FIViR5UAqNQfI IHGdhtY2v2NSdkTPT2+JHLzMt2+hTl8bN96HFxZ2gZiy08gy1BE2Md5pzF+XCIRLpn1X MM+A== X-Gm-Message-State: AOJu0YyA/Mtson2kECBRShMTR61JsrpkmHNUlZcTPC9mGxPyEoL4riuP TijZlFdep1B0VSW+RcLVB7xlnLlLhLGqprp3bDRrUi1HdZRiCtdGpY8pDREDv0n1cpM7vCRtvm1 Q/1jyIUE= X-Gm-Gg: ATEYQzwrHWVyiJdZ3xLRti0tefktvIV5zWo4KuCubLUd+t0gx0McKqiClXVPFNzN8oe hNAJiTnX6UGbK9L6OPhf9gI5+J3P0xIFRt7oNTYs8/bwVMainY9Sh3O4bxLrERvXl3XDFoqbufe PF+XO1+fyknsC1NYLPcL7SqkGLYngj/tZeM4VoRR89iPlCFBPEWX5028ehkxli8lusOLbwDdG8F DSLQyE6k3PSiU53fDq2cixa3eMv73flYy41Ea3FVwi3dMcE2WSsc5gruJdbH+Dir+jvqGwiUo0Q RnG6i6m8t+q/GumiAoc9zoFwEJ771vWtNuZLn91VK18srD9fB4Wa/ZRTXaV2jEjRx1BN0aksb5r heV4VVdfmE3/s9zEPxrSYnFPG21afJkq/bIRNenODAlMN/eIQF5prnAiYMNKvfZW6MmxeDnYM09 YO+RyywZXUB57NreSBWuQ2dCQQco5BAsxr/24ygDHxumIqD8PobYycAmUfdeyPnXDujw3EdaXz2 KdkeA== X-Received: by 2002:a05:600c:c173:b0:485:3812:36dc with SMTP id 5b1f17b1804b1-485381238b3mr50587285e9.9.1773009356689; Sun, 08 Mar 2026 15:35:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/49] hw/*: Build stubs once Date: Sun, 8 Mar 2026 23:33:56 +0100 Message-ID: <20260308223433.25503-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009368102154100 Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Message-Id: <20260225035739.42848-10-philmd@linaro.org> --- hw/cxl/meson.build | 4 ++-- hw/i386/kvm/meson.build | 5 +---- hw/mem/meson.build | 4 ++-- hw/pci/meson.build | 2 +- hw/smbios/meson.build | 10 +++++----- hw/usb/meson.build | 3 ++- hw/virtio/meson.build | 9 +++------ 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/hw/cxl/meson.build b/hw/cxl/meson.build index 3e375f61a98..5f61273a68d 100644 --- a/hw/cxl/meson.build +++ b/hw/cxl/meson.build @@ -7,7 +7,7 @@ system_ss.add(when: 'CONFIG_CXL', 'cxl-cdat.c', 'cxl-events.c', 'switch-mailbox-cci.c', - ), - if_false: files( + )) +stub_ss.add(files( 'cxl-host-stubs.c', )) diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build index a4a2e23c06e..a34b3504cba 100644 --- a/hw/i386/kvm/meson.build +++ b/hw/i386/kvm/meson.build @@ -15,9 +15,6 @@ i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files( =20 i386_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss) =20 -xen_stubs_ss =3D ss.source_set() -xen_stubs_ss.add(when: 'CONFIG_XEN_EMU', if_false: files( +stub_ss.add(files( 'xen-stubs.c', )) - -specific_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: xen_stubs_ss) diff --git a/hw/mem/meson.build b/hw/mem/meson.build index 1c1c6da24b5..8c2beeb7d4d 100644 --- a/hw/mem/meson.build +++ b/hw/mem/meson.build @@ -4,9 +4,9 @@ mem_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c')) mem_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_mc.c')) mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c')) mem_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_true: files('cxl_type3.c')) -system_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_st= ubs.c')) +stub_ss.add(files('cxl_type3_stubs.c')) =20 -system_ss.add(when: 'CONFIG_MEM_DEVICE', if_false: files('memory-device-st= ubs.c')) +stub_ss.add(files('memory-device-stubs.c')) system_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss) =20 system_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c')) diff --git a/hw/pci/meson.build b/hw/pci/meson.build index b9c34b2acfe..a6cbd89c0a3 100644 --- a/hw/pci/meson.build +++ b/hw/pci/meson.build @@ -19,4 +19,4 @@ pci_ss.add(files('pcie_doe.c')) system_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'p= cie_host.c')) system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) =20 -system_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c')) +stub_ss.add(files('pci-stub.c')) diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build index a59039f6692..9bf4b1ad1e5 100644 --- a/hw/smbios/meson.build +++ b/hw/smbios/meson.build @@ -1,12 +1,12 @@ smbios_ss =3D ss.source_set() smbios_ss.add(files('smbios.c')) smbios_ss.add(when: 'CONFIG_IPMI', - if_true: files('smbios_type_38.c'), - if_false: files('smbios_type_38-stub.c')) + if_true: files('smbios_type_38.c')) +stub_ss.add(files('smbios_type_38-stub.c')) =20 smbios_ss.add(when: 'CONFIG_SMBIOS_LEGACY', - if_true: files('smbios_legacy.c'), - if_false: files('smbios_legacy_stub.c')) + if_true: files('smbios_legacy.c')) +stub_ss.add(files('smbios_legacy_stub.c')) =20 system_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss) -system_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c')) +stub_ss.add(files('smbios-stub.c')) diff --git a/hw/usb/meson.build b/hw/usb/meson.build index 17360a5b5a4..ba55c28ef69 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -9,7 +9,8 @@ system_ss.add(when: 'CONFIG_USB', if_true: files( 'desc-msos.c', 'libhw.c', 'pcap.c', -), if_false: files('bus-stub.c')) +)) +stub_ss.add(files('bus-stub.c')) =20 # usb host adapters system_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c')) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 821366f5e90..415e359e9fc 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -48,8 +48,6 @@ if have_vhost system_virtio_ss.add(files('vhost-vdpa.c')) system_virtio_ss.add(files('vhost-shadow-virtqueue.c')) endif -else - system_virtio_ss.add(files('vhost-stub.c')) endif system_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhos= t-user-vsock.c')) system_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng= .c')) @@ -92,10 +90,9 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: fil= es('virtio-md-pci.c')) system_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) =20 system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: system_virtio_ss) -system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c')) -system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c')) -system_ss.add(when: ['CONFIG_VIRTIO_MD', 'CONFIG_VIRTIO_PCI'], - if_false: files('virtio-md-stubs.c')) +stub_ss.add(files('vhost-stub.c')) +stub_ss.add(files('virtio-stub.c')) +stub_ss.add(files('virtio-md-stubs.c')) =20 system_ss.add(files('virtio-hmp-cmds.c')) =20 --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009386; cv=none; d=zohomail.com; s=zohoarc; b=hpCP2NhDAViNmWL/FgKZ4wdNh38lKVjInPpcrKjWHNMOzvHsO6Zsdj2A27HhhEE/qVaClYObUb1ayKRuvf87sxKkqGI3wSvf1HM3Di/Oy9Idul0NbMp98v7BYXv3PJewWpIrh3xZVVSHq1PgLY/yV+a9jn558AC8YQWUtHoMZBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009386; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=t4eGZ6Wov9vgJTgXJvaXO5cQavtM/WJnNpf+PFgt2X4=; b=J/STtQC9OUZop/kyzE2qXMidKBybe5pvN8nUGAzVTd5F+Ck9oDBxP34zrm0Zhn6Hug8Ff/f5g3RLVlJBov7h6lnc0vefFhmba2xOyVmV3WuuzF6tzN5daFRtWrVE8JaixDcUAj4QBzHVa3Xymatm09GMXqZa3GYRnoeQkc+ID5I= 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 1773009386067719.1413107876643; Sun, 8 Mar 2026 15:36:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMjM-0003EH-1K; Sun, 08 Mar 2026 18:36:12 -0400 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 1vzMjJ-0003Bj-OK for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:09 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMjH-0003ML-Dv for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:09 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-4327790c4e9so8465628f8f.2 for ; Sun, 08 Mar 2026 15:36:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485237e8095sm127662315e9.2.2026.03.08.15.36.02 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009365; x=1773614165; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=t4eGZ6Wov9vgJTgXJvaXO5cQavtM/WJnNpf+PFgt2X4=; b=yG7Zkfd1PfB26gSBMzX8PkTG+WSOdhT3Hn0DVZXqJyLZfPCep0GhTGl/8RG+rb7Ksl B7CuesFl8XwU78w5B0z2AliFJySr68EPb34zA+bBrxsB6OOS7n5Puuf+3zKxTROCOU9j ozEhaff1qYZmIuVn1j+9dpZLPSUCerGvuB8Om7i6l9zHAXFltkN+igO93j3SwdG6ACOm Snwv53DJ1v1XMa2pXlcrr2sKpyTVwie5hxFuJJ8KtfcrmlpcfM4jG2352E88S6+YWHT3 oXpoPd5RasbyYRuUDMCmF0JN1iBWb2ne7fHh8GnLKvfOY1LyssppIKH+r70csCWREX8G st5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009365; x=1773614165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=t4eGZ6Wov9vgJTgXJvaXO5cQavtM/WJnNpf+PFgt2X4=; b=HZCXmyASGot4KKIZ5Fh1dToiBl+yDPBw7xnGqCN0vc0MBi/hbYiibvxjLmq3MydLv/ NoU0oL8OoNUqeGDKBXgcdLhLN12sIZAd9NB6x8dZA6f0MtUSydDjaD+ojrptagNzmi7S /J/hZAYFFLp/v/f4rVfQUUxNXXC6Ti9TY5Ew+pK1vOj+MIjtbhAD9+uXsVYTRYQGOFDT UQfbPkdce4nHE0RPp4Ece/JIfw+fxwLDHjLz+m9qhhOkO34CGXwrbquvWmKEkpka8BM0 bpqZNcr6c1Y3mn62xw/EsOuHJac97z44/kl2JbvOtHGciOOwbgnP3pd5ttYpH9jnSkDd pg5Q== X-Gm-Message-State: AOJu0YwZ3fBj82C/kVw6r1E0/CaMRz+NK+Adnqn4CORLOtbt1mgvz1cZ 7sPqFyFosto0KmgdfHi1ak0+CzZOoq8L88CQt6L0IFrxyxrVPENwxMDPSe3fBOK3aAd8TaKlZ0Z e8wfh0i4= X-Gm-Gg: ATEYQzzToF/2jcSykIhvul5hnbOhPkkq2ZWB1cFU8sEv7j6tOzdsbe3xzUeFoWekGOU M+b/MrYZMcrLI400BvKtYkyEAyvU2vm3agTrZS1KDxEMoxN+E5xu5P9f4TZ7I5KMG7l663dNX71 y1eQSEIZW+++Kbbp/vGE7CBYfAUoKdQk7nqXi+ObmFBw/hCctoSmwH3sKiKKcsPzBRIKodz/2xH Gvl5LTdSRyTCv+fItLsU9uCEKPkoz92t4WtLi4YOcPbB2JwJkDPIdK2EmOGGxx063K6pTR74Dee CC5+1Wac0WamAxfbPf3aojBzGvzL+lRm3OePvI0n47zy0olUYwCrWGf0PgevbFX7z6o/iUglbB8 P+SFNas9rdqaAMCf2hy9BkNTu+QUzCw2DbyPRpy7kIGhaDCbmHQqWcjaMhqp1LCKn8/DzihFGIZ G1vwOzD1Kjri4cYqc4M+C/QOqxK+L8quxqs+B/b8qvYyLRRaZSSFwtM3KQQni4Dkmt+LNZaF3HI sRH+Q== X-Received: by 2002:a05:600c:4752:b0:480:4a8f:2d5c with SMTP id 5b1f17b1804b1-4852697721cmr157502685e9.29.1773009365207; Sun, 08 Mar 2026 15:36:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/49] semihosting: Build stubs once Date: Sun, 8 Mar 2026 23:33:57 +0100 Message-ID: <20260308223433.25503-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009388025154100 Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Message-Id: <20260225035739.42848-12-philmd@linaro.org> --- semihosting/meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/semihosting/meson.build b/semihosting/meson.build index 99f10e2e2bb..15e3be26989 100644 --- a/semihosting/meson.build +++ b/semihosting/meson.build @@ -1,4 +1,4 @@ -common_ss.add(when: 'CONFIG_SEMIHOSTING', if_false: files('stubs-all.c')) +stub_ss.add(files('stubs-all.c')) user_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files( 'user.c', 'guestfd.c')) @@ -8,12 +8,13 @@ system_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files( 'guestfd.c', 'uaccess.c', 'syscalls.c', -), if_false: files( +)) +stub_ss.add(files( 'stubs-system.c', )) system_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', - if_true: files('arm-compat-semi.c'), - if_false: files('arm-compat-semi-stub.c')) + if_true: files('arm-compat-semi.c')) +stub_ss.add(files('arm-compat-semi-stub.c')) =20 specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_USER_ONLY'], if_true: files('syscalls.c')) --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009387; cv=none; d=zohomail.com; s=zohoarc; b=gflPZVeJ1hOhj3QBPaTzGF56KhycN/KR1I81YAqsUSxT2Z27g+hI6/gr5f3CyhVznNgcX8XkDtxUAUkCF9POrZ2BDvA+S6gWq4if7jCBddxv5ykarr+c2pDXcb1DPUnILil9U5XRMky+CAFcTxKUnpAjFgp2lfLBtK0oGzgM0M8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009387; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=C6RmIeQiTwJ3+6txXA5Lk1LKbCm90eL+X6+snaXIrnY=; b=UNkbzEAn260VJ7+Q0/fYC+k7J4WEf4xHNIZGvkRvK2WDpxTSfH946eBa+u5JiULWDGW8KPYr+tcU3Q8+Ugm44/YeodB9IwNHJq3PBAWrUs/4B4DGfPODXqoI+stLkA14y3xWmDH4rFDWNvvqTObeYjL8CKbMbhfBor71yI7Rh3k= 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 1773009387401400.94055322475776; Sun, 8 Mar 2026 15:36:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMjT-0003NA-4d; Sun, 08 Mar 2026 18:36:19 -0400 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 1vzMjQ-0003JU-OP for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:16 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMjN-0003NN-Uh for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:16 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-4327790c4e9so8465658f8f.2 for ; Sun, 08 Mar 2026 15:36:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae45786sm23222664f8f.32.2026.03.08.15.36.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009372; x=1773614172; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C6RmIeQiTwJ3+6txXA5Lk1LKbCm90eL+X6+snaXIrnY=; b=ZFfA+NszByFwGB+llkB1KKpFqW8ZjzqnXh5hd8BqddI3iZIxD4pCYgz4PS6Nwmj+Ze R/dTp2cn8D93M6WXcyxv45rr13XcbJiSx6k6epNkFo5wWVbaDjHfN0hD4sZceVznO6KP wAEwr7zqEhSyWSiDKeyDo6RswdCK6omyBTtoeXLeEnrTwnNOsRLGjrvpu+e9LiJitUUd ut8xR+gwgUI9bYqdT7p3IeVhmvpdvcpHilulnJXpBTGY0R/2TjQ4xwxM3XYGla8h+Fm2 8RaKlZYzT7pRAXF7dhmKG1TyU9CotE9bneeJwAdufabMwBFQUuj1hgpgiw+lGq4mNqGy la1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009372; x=1773614172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=C6RmIeQiTwJ3+6txXA5Lk1LKbCm90eL+X6+snaXIrnY=; b=Al0v/V7ZThWDU4H4IoNhtx7wu9b4wD9YNbhQ7mgJ3pmNMujU3e66Nq8yybqVSImdmh U2SkGuunodFseT/DmxqOq70eotbdEyEJHfL0gfi20le0unGuWRJsFaws64S/qOhUNwFh clcnnU5zWjB+GLjNyBHC0T7ri32oPQ+SYKpiaxwQxyyajn2m84m/MG3ApfwPHLJikVqc aGHU1mGH3gbTvdVs4sHImcokIvjeLw5GxjF6DuSAjbPxPomQ77UXlrmlVH7PuS4fs5WQ 1UF+pmeiewEDW/0Gk+2oGiL3G9dZ31JBvYQjghFZqLWx+VODQVLBYU+urJj3fBxaMdLK LmEQ== X-Gm-Message-State: AOJu0Yy+LvKPD3EIARfFqHOYX40DteY1bianh5XHtNWJdaTfs7F57T3S F7Ec/+PdAwg8AgJ6OrVezIiEPib+pSf397iWyorjgpDTc7y0tt40v27Ad67LG7rGJZde7cfO77r syvMfTdU= X-Gm-Gg: ATEYQzzxvxTh2MgPbRTwvi+9ylw0sb7Azk2a92qMe7k5AoE3H7+1V41BQU56woU4g8A cmOzGz8fPiONpi/LcpR6I69LhjPp+U1ryI88FWhrEzHfpP3I9//fwnMoQjddsjlZb7OkLzcmfwe 6CUqb4IY+l0VSiOVh31/2fmfzENXeZ5lKu6g7Cq21SyPhx23mCB0FYG1et8IBpoifIC1TjyKUVL szbObh/x2hFTeGOxYqzIad1yhyaWa45w5CbX8CwZQv13i6ZWIYT1yTb1VYrAIlHBT9/fMhhJlgV YH4PJInf0TJBciWMCPU7Fef1JZNPiRxWIrBTAkDE8yaTT2z5nvUDBBPq1UDVg/BEYep/QW1lxin SBu3yFP2Onbw3q8hPIGj6mJvhnG7J3fQTnrghUJFNm/bK/jm+RnJLd4H5SR7IlQngkRHBz4A5fZ widMhTHjEy3pjmm8wajr40wdSKWbsHaJUe7K0/E5cmSHRClYNFTEI1QNeSS3Vz62yL2+EL7AHLc Ml4FwSPw1kbYgih X-Received: by 2002:a05:6000:1865:b0:437:8fd6:d849 with SMTP id ffacd0b85a97d-439da8a2ef3mr15386656f8f.54.1773009371974; Sun, 08 Mar 2026 15:36:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 14/49] hw/s390x/s390-pci-vfio: Avoid including CONFIG_DEVICES in hw/ header Date: Sun, 8 Mar 2026 23:33:58 +0100 Message-ID: <20260308223433.25503-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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: 1773009390064154100 By turning the inline functions into stubs we can avoid the use of target-specific CONFIG_DEVICES include in a hw/ header, allowing to build the source files including it as common objects. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Farhan Ali Message-Id: <20260225031658.32095-4-philmd@linaro.org> --- include/hw/s390x/s390-pci-vfio.h | 20 -------------------- hw/s390x/s390-pci-vfio-stubs.c | 32 ++++++++++++++++++++++++++++++++ hw/s390x/meson.build | 1 + 3 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 hw/s390x/s390-pci-vfio-stubs.c diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-v= fio.h index ae1b126ff70..f7d6149daf6 100644 --- a/include/hw/s390x/s390-pci-vfio.h +++ b/include/hw/s390x/s390-pci-vfio.h @@ -13,32 +13,12 @@ #define HW_S390_PCI_VFIO_H =20 #include "hw/s390x/s390-pci-bus.h" -#include CONFIG_DEVICES =20 -#ifdef CONFIG_VFIO bool s390_pci_update_dma_avail(int fd, unsigned int *avail); S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s, S390PCIBusDevice *pbdev); void s390_pci_end_dma_count(S390pciState *s, S390PCIDMACount *cnt); bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t *fh); void s390_pci_get_clp_info(S390PCIBusDevice *pbdev); -#else -static inline bool s390_pci_update_dma_avail(int fd, unsigned int *avail) -{ - return false; -} -static inline S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s, - S390PCIBusDevice *= pbdev) -{ - return NULL; -} -static inline void s390_pci_end_dma_count(S390pciState *s, - S390PCIDMACount *cnt) { } -static inline bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t = *fh) -{ - return false; -} -static inline void s390_pci_get_clp_info(S390PCIBusDevice *pbdev) { } -#endif =20 #endif diff --git a/hw/s390x/s390-pci-vfio-stubs.c b/hw/s390x/s390-pci-vfio-stubs.c new file mode 100644 index 00000000000..d9882b7aad0 --- /dev/null +++ b/hw/s390x/s390-pci-vfio-stubs.c @@ -0,0 +1,32 @@ +/* + * s390 vfio-pci stubs + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/s390x/s390-pci-vfio.h" + +bool s390_pci_update_dma_avail(int fd, unsigned int *avail) +{ + return false; +} + +S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s, + S390PCIBusDevice *pbdev) +{ + return NULL; +} + +void s390_pci_end_dma_count(S390pciState *s, S390PCIDMACount *cnt) +{ +} + +bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t *fh) +{ + return false; +} + +void s390_pci_get_clp_info(S390PCIBusDevice *pbdev) +{ +} diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build index 1bc85837996..57cc2a6be3d 100644 --- a/hw/s390x/meson.build +++ b/hw/s390x/meson.build @@ -34,6 +34,7 @@ s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: fil= es( )) s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c')) s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c')) +stub_ss.add(files('s390-pci-vfio-stubs.c')) s390x_ss.add(when: 'CONFIG_VFIO_AP', if_false: files('ap-stub.c')) =20 virtio_ss =3D ss.source_set() --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009391; cv=none; d=zohomail.com; s=zohoarc; b=exy9Id440X27fMZPIo3kkvdq7bgf5zFmWVsjJWZzsg0kpHpEwrLz15MT6DikYWMKSeTy/EFlnJisSqsVM1tqW5FB/0xw+4FDQ38G2rWnKiHvqT6CMdPrRHh24n9dUZ6rJr6gsdKYBurEDMRZDycndvsKRakm26lRuUYg+ozSoFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009391; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=1zHa6CCTrFYbjN6RjQR3YC8ud8RTRle2qGhoFe0WxOA=; b=DVvZSAtqv92NAqy8MvA7aVKjgsHELiQgqNKxs+OSRSo2f8MYGj9AiCEcIbFd7Z0op0kSGEIDjXbOpBWi8LLnreHiBtDZc1HVBPN0xZPBPGtCPeJOHy6HaOng0KO+UztUaXszAKZ5raVpXPO7bMH5aJ2RpnUq30AwUSaScULcMOs= 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 1773009391085505.56403377996946; Sun, 8 Mar 2026 15:36:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMjX-0003Uw-H3; Sun, 08 Mar 2026 18:36:23 -0400 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 1vzMjW-0003UO-4a for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:22 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMjU-0003OV-KA for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:21 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-482f454be5bso111175485e9.0 for ; Sun, 08 Mar 2026 15:36:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48527681e2bsm212856695e9.5.2026.03.08.15.36.18 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009379; x=1773614179; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1zHa6CCTrFYbjN6RjQR3YC8ud8RTRle2qGhoFe0WxOA=; b=i9XonAAa/1nA+w933wwoNaW1BcK70WY1zt1nSgvvvCpI4psgLBojtQV2GOGmUneljc U3vjjfSG7kdKxN+x4YER6q8MlTfegmu+OTz0t2/tQktGppq3iVgRJsgOPvZOggJVR1EP tw4QAmsUdCdqoTT0bzDHokG+s4YjfNXGD7H5UVyydeI6ieGip2LC2jKO7N2BA8T5r/R/ t8Ja/vhhaa1nrptl1b8xgrhPZWw9nqkzUAylwRRS4ITKvcm9Sv8WAMawnzlSxSAf8MHG PIO5LAHkVqRI3ua/Y5EzoY+lRDTFWsJ+K7f7gRrsmLtEBXthWu/ZPbVVwBONvoojIZc5 hlpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009379; x=1773614179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=1zHa6CCTrFYbjN6RjQR3YC8ud8RTRle2qGhoFe0WxOA=; b=ZEc0i/jXi0Bxecz+1tJB2NXcYQybzZHoo5Tawl0UhIZmNAqYloHhgWhibJGw8/c1+n FscVAbQ5hxmJpJ21h/l0SOY58tjwt34VSF9IE6Q2lVmtdefvB5dx3x4ZjJfc6HuTnESc RZOCfP41WfHsNJBTfSK7JWhAb5bbqBAZlDv+FeEKZtn+hsnqTYORJNpA7PXdicHVC8S4 j+3l8MJ11yllj4aswVnReAg6KuGU8SO+T9Yzg4Ug7LS7tzp8kuqqy4jl0ESKs6d61uWR 7bFwze0UAKe2CtK+7nDHkCeB8LnPnIAZ04oVDEddP2NHhOQjBT6G6i0NJWaMptPIFSSy uSPw== X-Gm-Message-State: AOJu0Yzd6qwluRPeTrf1Eek+OMnsxDLQ1d5QMDLmyZ8Vbw2Zvu8C5W6Z W0MY6UT0jBV0Jw+D7F+0RVVxQOZn2oHxLDzcY+f/87I0i9gKGCi+97kSKxYsMmO8I6KqId0GDY8 Q0VJrL4U= X-Gm-Gg: ATEYQzzJawLZpXYHXMF8rOOh5GeG2AUX8v6kJMPhrEEbURroo9zwZnD7Oi8BUmGO3jh uNTDwxqc58fcV6lbDE8epatxL11zzmmv/SsREUG8Eo+wuavI47frTbRNe3WjYxxqpjVyCdUhr2T xE0IE0ZwK20Ub5lq650gYVxK/LuHwOSV/31YKj08GuWHV4GWVWz+G6+hLyOG2LdtetuUyHKfquo bGOX/DrQiuLhN/vbG8CCSnyaVb+IUsx1dpdyg5/GnKi9Xpu9yWBJGnrkOmHWPKQ+tPuRJ1ZF/mo a8Z2yywVNKw9/E9xTqmFGgmv+ucjx34r8d2J6Ith0c6eKPDXbNolBnCaH3iRvidfG6hbKg/QElp watqJkfCQjZcREuw+9J4+MNSp68Gg9tKrqaRgGxl7i6Q3JyumCcKina6a1nFPZYmPPlQ+7bCYnN YMr1gKJSDvbNQJosRK/mGSnevT6ViZARPNEgdejMEo0PVv95dGZJVytM4oExZnXIbgWcCM1u4Ii nQ65g== X-Received: by 2002:a05:600c:1c1a:b0:485:38f1:5cec with SMTP id 5b1f17b1804b1-48538f15df6mr45316565e9.7.1773009378841; Sun, 08 Mar 2026 15:36:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 15/49] hw/misc/ivshmem-pci: Handle error from kvm_irqchip_add_irqfd_notifier_gsi() Date: Sun, 8 Mar 2026 23:33:59 +0100 Message-ID: <20260308223433.25503-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009393018158500 From: David Hamilton The return value of kvm_irqchip_add_irqfd_notifier_gsi() was being ignored. Propagate the error to the caller via errp. Also change setup_interrupt() to return bool to follow QEMU error handling conventions, making error checks at call sites simpler. Resolves the TODO comment at the call site. Signed-off-by: David Hamilton Reviewed-by: Markus Armbruster Message-ID: <20260225121323.5395-2-dahamilt0@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/ivshmem-pci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/misc/ivshmem-pci.c b/hw/misc/ivshmem-pci.c index a3a43f53bd1..c987eebb983 100644 --- a/hw/misc/ivshmem-pci.c +++ b/hw/misc/ivshmem-pci.c @@ -442,13 +442,14 @@ static void ivshmem_add_kvm_msi_virq(IVShmemState *s,= int vector, s->msi_vectors[vector].pdev =3D pdev; } =20 -static void setup_interrupt(IVShmemState *s, int vector, Error **errp) +static bool setup_interrupt(IVShmemState *s, int vector, Error **errp) { EventNotifier *n =3D &s->peers[s->vm_id].eventfds[vector]; bool with_irqfd =3D kvm_msi_via_irqfd_enabled() && ivshmem_has_feature(s, IVSHMEM_MSI); PCIDevice *pdev =3D PCI_DEVICE(s); Error *err =3D NULL; + int ret; =20 IVSHMEM_DPRINTF("setting up interrupt for vector: %d\n", vector); =20 @@ -460,18 +461,22 @@ static void setup_interrupt(IVShmemState *s, int vect= or, Error **errp) ivshmem_add_kvm_msi_virq(s, vector, &err); if (err) { error_propagate(errp, err); - return; + return false; } =20 if (!msix_is_masked(pdev, vector)) { - kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, + ret =3D kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, s->msi_vectors[vector].virq= ); - /* TODO handle error */ + if (ret < 0) { + error_setg(errp, "Failed to configure irqfd notifier"); + return false; + } } } else { /* it will be delayed until msix is enabled, in write_config */ IVSHMEM_DPRINTF("with irqfd, delayed until msix enabled\n"); } + return true; } =20 static void process_msg_shmem(IVShmemState *s, int fd, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009398; cv=none; d=zohomail.com; s=zohoarc; b=lUcMGJRGCuQPiTYMERthyYYWNnvUZkMcPd6E1QWV6W3f1vBQ+c/hFWAvCRWKD6U2oEX458bsiMaGxIbASNZAWth9yGrHnVB6oJtZsY7IU4gUE2Qxk/zM2DZoMwLh86+5s+i8N782fVikJLPoX/g0qPaxC4rZOoZ4AIaaevN1UUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009398; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=+yRRJgECb4/26rJHc/IeEtstl18ywy46YVHX8cCDbag=; b=K5cCgnn83jc0HklYblalib9sIvsgnHq4vSUbxq50BHtxBGXir9EdSSbVgxoEav9JceRfw5qNGRPxmYiLtX6AHcfPw9iBHcA4x9IFzLSCiTWxnIvYDIui9OpT1Nkp++V3eisLIzs3s35dm/mO04o/heFdnkGSGR0+omnflptPqQ4= 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 1773009398648331.976543603986; Sun, 8 Mar 2026 15:36:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMjf-000461-2N; Sun, 08 Mar 2026 18:36:31 -0400 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 1vzMjc-0003qR-VM for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:28 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMjb-0003P4-CY for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:28 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so17226185e9.1 for ; Sun, 08 Mar 2026 15:36:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853a946978sm51844095e9.1.2026.03.08.15.36.24 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009385; x=1773614185; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+yRRJgECb4/26rJHc/IeEtstl18ywy46YVHX8cCDbag=; b=J4mTI9NH3J9r4QbZlm4p2DZ1nnsnkkBOijrxH42Tmrh2bOIW7zdjmAtq50eVZCMjnk fkMPqMql+2EO36LFVrcH8i7gT7k1cuy0jSQPS7H+E1YOD+CQ2GNm0X2P3vSoYj6tzpsE ZzOUzUiGFDNfRlAgGvb+3/P+YZaGJDJcpTYqUAFDqfN0iyxkVnGmqv3CFiUZO7K2vF05 UTAHr6OjvBlYGD3uJGoasam6hZp1lca2VGH7SndBDrfbUBDP2KT7L2DF2JReAt6DOtD8 gfBFJ0Yyc/RGH2wqnZTz9qq8+yhYN9W5hTiL10VF/egBAEvkWx2Dk7l8d4WpDASqwxW1 o8sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009385; x=1773614185; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+yRRJgECb4/26rJHc/IeEtstl18ywy46YVHX8cCDbag=; b=joO3zMsc2GEYwHpbgBex2HadEQ5qgk+zpRkSLw1jXRbCSb3TXFQf4GY/uKX3khlXOC PHlg5nHodxX3VtN0BF1LyzPzUJ0/ZMAdW1CLT34H7D2OiAia/7FlZ34J4gnh+Xgf2Ci9 2z2wtnr/0d3mDPXap/wFRN7ZhI9pMHQElaZ+JP3oITuCowVhpE2krJcC1+6oaOLksaR/ 8XrnCMsfthyLNlnZ5qvjR7q0hS6bTzoZjXN0C6qu7xKhp79vfYq+GSIEZ4NoaAIV3aor lwKkvxAff8xhasRa2KYONmcaOwFs79Y1Sek0ZsPpx8014420jKl6U5LdMtMdYY9qPnnT eW7w== X-Gm-Message-State: AOJu0YwsFjgpEAGZgakE1iBA7fwZ3CfIXXoimcsxdVUyraXg7vmFLnVc ooWakOyV5hmwQg6nlN2PawlJCrfXF7clywjuiBro8vJF9A/iWzuG8KUtaFDgp8mX6QDc3kCMsTo jJa3FE8g= X-Gm-Gg: ATEYQzxFeBfX3UpbyvfhPqy+ujNc+Q8/92FDqOvh6Yr1poFsvOIT+AwdOfg/+VrFhGz CcMTeT9ubEkD75mMFfROvnHSLYN5sJmnQ2PhCjrWS3uqNBVGMSSvuZznTqU/6MQOnY4OTEarCaM VSM0m+8LzKB6J6baAmJsI9Q00CMjS1L/E3NbT1tWVyi6/cj4V8orIlRh6iDERpdAc7ZIL57IV5Q U3FcZOx/dnixJ3CmZbpN/vG+x0iqIniVla4ofARyQ/HBKKFGNflw9GWnehmt9pylyJzloh1R7hg iSgvhWK9q5sjnwHU2gCpZSjxv/cQA5qCRoWR1NsDwBBLW4uCbNf2e+toER5Rf/kqOHdgyKveVDP /qLsEvSXhVPlNRJwd01V9kMHEFi90tnaxd80tuX0n3aPhNWYYo0NqxsksnL1IynjyiDfRkCIAO+ 1GjhoaobWuPpScIVgT5jax3vTYN8S1BZhHiou/AJbmXsXYii+30HGnjvrbl+RrgevimmsS/3Djg 4kFwg== X-Received: by 2002:a05:600c:3b0c:b0:477:7b16:5fb1 with SMTP id 5b1f17b1804b1-48526918939mr162944205e9.7.1773009385444; Sun, 08 Mar 2026 15:36:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 16/49] hw/i386: drop unused PC_CPU_MODEL_IDS macro Date: Sun, 8 Mar 2026 23:34:00 +0100 Message-ID: <20260308223433.25503-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1773009399033158500 From: Daniel P. Berrang=C3=A9 This is redundant since the 2.4 machine types were dropped. Fixes: 4c82e7b34b1bf35d97e026196f5bf10ea916512c Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260225165400.605941-1-berrange@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a38634e3577..052226baa57 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -73,15 +73,6 @@ #include "hw/xen/xen-bus.h" #endif =20 -/* - * Helper for setting model-id for CPU models that changed model-id - * depending on QEMU versions up to QEMU 2.4. - */ -#define PC_CPU_MODEL_IDS(v) \ - { "qemu32-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }= ,\ - { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }= ,\ - { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, - GlobalProperty pc_compat_10_2[] =3D {}; const size_t pc_compat_10_2_len =3D G_N_ELEMENTS(pc_compat_10_2); =20 --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009432; cv=none; d=zohomail.com; s=zohoarc; b=fmeCB7m2od0DA67M9skKYEFwczzGf7TrXd/ruiYUx91PRYrjp6EaZ5Sw1ds8DVw/+W8GTQAi6kiOm3Oz6xy0TUGg7ofXVM0DPWJms5aQBJq2NYKTKRHAcYh9hihm+casf9CbG/ORcBQZ1rcN6tZqz7DMkN3Dfu5BIX0Kfu6OpVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009432; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=MMpo2dVbblEgNJoHcFyCWBR/CdBXrRHvlyFTaz/KWjc=; b=OqSkpRjdiKXKD8rHZsMlnRd2Bfm8grkhbpEx1hmsPKfUc/8vDCOikyA9rYGgUqQ/AhQ6zRBr+4ZZ//EuTvPM4UGJJxakqcwJzSipsn/BI7au4ulSik5uJ7LC9lZ8ouHkJ4A4nwaxHTbsemrnl/Wa8avV/7VF8c80gpVqN4lROIo= 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 1773009432610716.9445593609335; Sun, 8 Mar 2026 15:37:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMk4-00053d-R5; Sun, 08 Mar 2026 18:36:56 -0400 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 1vzMjv-0004Vs-Qc for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:50 -0400 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 1vzMjr-0003QO-Kk for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:47 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-439ce3605ecso2640170f8f.0 for ; Sun, 08 Mar 2026 15:36:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dadac2a7sm21165650f8f.15.2026.03.08.15.36.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009392; x=1773614192; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MMpo2dVbblEgNJoHcFyCWBR/CdBXrRHvlyFTaz/KWjc=; b=O7KcRPieXJJbQy8N3unT0SkdKGM1gqQEsoI18eeLys+1u/JQYyECteB37pYOnMRbvL pikBOntgDlmmqG47+2ZhqZDmEMv33rWlqi38HXIv+Bp7BrrVf2GHq7kOlH4ozAGN5SAK K3GbpNuUFqsCjtXu9blr44l0NdUP6d9LlqpmaPnf0vsD0/hmANNUbTjdWQ46H2MhdYE+ TACv7Lecp9EVa4sp5+Z5Ic28+gWysZWWeqgh95YaMGtwSsLTl3WGkAr+1wYooK36yKw4 /U6WbOkOhf/3IHgYtc51YzioVHmfEHNcYtGQDpSOiQWmLYz5dLQv5p0k7P1lrYeVOfGh J3kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009392; x=1773614192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=MMpo2dVbblEgNJoHcFyCWBR/CdBXrRHvlyFTaz/KWjc=; b=ZPQ93a2aS/L1AQEQ/PZyzS9tlOuKlzH9oQD2veWj8Jd39f1D8lKxp9082gPoQjLcD2 U3u+arlwqT1QrcdDaD6dLBMkksOYYrsUI8nS2o71npLiOGfjzfMyJDyjEQsdZfpEfe/R bjQSgpfBpO9B7dOhqqmLw8EkrmsQL8A3KFe1GMaYT784nDduvDKbLeMQnCg1yHWT8MUC ZqlmzOhHFiQXCedDxA+jbx7Qs1Bh2Yy9NzYtoVMtAEYRifH8azmxtDwMvNVSG6r0uDjJ E/lmZVvHqJiS+yh+boFUEHrshbpixjnMnSln8RdnUGnn12m5HmYWWJti42h5JrbDele6 jTfw== X-Gm-Message-State: AOJu0Yxtxp++OAnInTTZ3Yo8LEgbd14ziO41wzmGORaCYDWFe+YcTIwV GOlBekOyQrFXCfKjvDuFW/lLEBmT8WXkDX7qgKf5AaRne5nLB/xnC9C10KdF1IthDiaHpikfmBP m6I/BH+k= X-Gm-Gg: ATEYQzztOGloNDAMdU0i+P3OlyIjfuyiXCZIpbHEkygHfnwcjkvW/q2s5gFBr4HgW1o ecARdVt9Dw5JAbVa0RHF/wenBIN6l+r167EKegupYHTWJ5WcAfzqNY9QWroA76Qri5fIDQwH+Af Y4F7XyKz9lg1oKTbCFnHfSLKFQs3wxNnv0WtuxeuLuSf3G254/+2SMavfTEsh6SxM7nRi5ufEtx XoAVIaQHIBwn+sMhE0OYIdaxuvJgis0Lgk/1QEZozeqK3IuEoGpzvbOyve/1Iy5+/prXAs27WpT EcD6ZSEwlC8E2IddcqCQuDIIQBdwqEYNuUoiOFzMMK6AXyvy+3Bq7qcOVFNroJavl2d0r9f30Bf eHU6dYLusLgxWoyWGwPnhgo4XQAG5I/yGpwQli6UF3h3avVsdfX3mD2WOYrrRZfF5ptFE1typNh 84qVIxkLDxPP6OSxrGGAtJuj4/oCIvg7HistL5T3/vjpVgcwWQJZykCt6BwBkr7GqVCjQewWB9F ww35g== X-Received: by 2002:a05:6000:1865:b0:439:bcab:405e with SMTP id ffacd0b85a97d-439da885f29mr15824547f8f.35.1773009392171; Sun, 08 Mar 2026 15:36:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 17/49] ati-vga: Fix framebuffer mapping by using hardware-correct aperture sizes Date: Sun, 8 Mar 2026 23:34:01 +0100 Message-ID: <20260308223433.25503-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009433238158500 From: Chad Jablonski Rage 128 cards always request 64MB for their linear (framebuffer) aperture and R100 cards always request 128MB. This is regardless of the amount of physical VRAM on the board. The following are results from real hardware tests: Card VRAM PCI BAR0 CONFIG_MEMSIZE CONFIG= _APER_SIZE AGP_APER_OFFSET Reviewed-by: BALATON Zoltan ----------------------- ---- -------- -------------- ------= ---------- --------------- Rage 128 Pro Ultra TF 32MB 64MB 0x02000000 0x020= 00000 0x02000000 Rage 128 RF/SG AGP 16MB 64MB 0x01000000 0x020= 00000 0x02000000 Radeon R100 QD [Radeon 7200] 64MB 128MB 0x04000000 0x040= 00000 N/A Radeon RV100 QY [Radeon 7000/VE] 32MB 128MB 0x02000000 0x040= 00000 N/A Previously the linear aperture (BAR0) would match the VRAM size. This discrepancy caused issues with the X.org and XFree86 r128 drivers. These drivers apply a mask of 0xfc000000 (2^26 =3D 64MB) to the linear aperture address. If that address is not on a 64MB boundary the framebuffer points to an incorrect memory location. Testing shows that the Radeon R100 also has a BAR0 larger than VRAM (128MB in this case) and the X.org radeon driver also masks to 64MB. For Rage 128, CONFIG_APER_SIZE also differs from the previous value and the behavior stated in the documentation. The Rage 128 register guide states that it should contain the size of the VRAM + AGP memory. The cards tested above show that this isn't the case. These tests also included enabling/disabling AGP with 8MB of memory. It didn't change the contents of CONFIG_APER_SIZE. For both Rage 128 and R100 the CONFIG_APER_SIZE is half of the PCI BAR0 siz= e. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Message-ID: <20260303024730.1489136-2-chad@jablonski.xyz> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_int.h | 5 +++++ hw/display/ati.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index f5a47b82b08..708cc1dd3a3 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -10,6 +10,7 @@ #define ATI_INT_H =20 #include "qemu/timer.h" +#include "qemu/units.h" #include "hw/pci/pci_device.h" #include "hw/i2c/bitbang_i2c.h" #include "vga_int.h" @@ -29,6 +30,9 @@ /* Radeon RV100 (VE) */ #define PCI_DEVICE_ID_ATI_RADEON_QY 0x5159 =20 +#define ATI_RAGE128_LINEAR_APER_SIZE (64 * MiB) +#define ATI_R100_LINEAR_APER_SIZE (128 * MiB) + #define TYPE_ATI_VGA "ati-vga" OBJECT_DECLARE_SIMPLE_TYPE(ATIVGAState, ATI_VGA) =20 @@ -97,6 +101,7 @@ struct ATIVGAState { QEMUCursor *cursor; QEMUTimer vblank_timer; bitbang_i2c_interface bbi2c; + MemoryRegion linear_aper; MemoryRegion io; MemoryRegion mm; ATIVGARegs regs; diff --git a/hw/display/ati.c b/hw/display/ati.c index e9c3ad2cd15..8438a77de04 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -361,7 +361,7 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr, = unsigned int size) PCI_BASE_ADDRESS_0, size) & 0xffffff= f0; break; case CONFIG_APER_SIZE: - val =3D s->vga.vram_size / 2; + val =3D memory_region_size(&s->linear_aper) / 2; break; case CONFIG_REG_1_BASE: val =3D pci_default_read_config(&s->dev, @@ -952,6 +952,7 @@ static void ati_vga_realize(PCIDevice *dev, Error **err= p) { ATIVGAState *s =3D ATI_VGA(dev); VGACommonState *vga =3D &s->vga; + uint64_t aper_size; =20 #ifndef CONFIG_PIXMAN if (s->use_pixman !=3D 0) { @@ -1011,7 +1012,18 @@ static void ati_vga_realize(PCIDevice *dev, Error **= errp) /* io space is alias to beginning of mmregs */ memory_region_init_alias(&s->io, OBJECT(s), "ati.io", &s->mm, 0, 0x100= ); =20 - pci_register_bar(dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &vga->vram); + /* + * The framebuffer is at the beginning of the linear aperture. For + * Rage128 the upper half of the aperture is reserved for an AGP + * window (which we do not emulate.) + */ + aper_size =3D s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF ? + ATI_RAGE128_LINEAR_APER_SIZE : ATI_R100_LINEAR_APER_SIZE; + memory_region_init(&s->linear_aper, OBJECT(dev), "ati-linear-aperture0= ", + aper_size); + memory_region_add_subregion(&s->linear_aper, 0, &vga->vram); + + pci_register_bar(dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->linear_ape= r); pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io); pci_register_bar(dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mm); =20 --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009464; cv=none; d=zohomail.com; s=zohoarc; b=JO3t3oRRhzAzLsiF5Nphz472rahblRG22d/uvSL0SLn6jHy4VH8ikUSPP8Tpo4azgtaFIVs+do9/w+1L584Z2voX/UPsHUMVKoZPJdJkoh0d6IWzbwYIefLx9NIZDZJxSq4fLQeBMp9ugveZLIxCtbi+OcIA59LK7yeRNjyoKpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009464; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=OBGHDfQs2oR/GEstE9rCn+hZYYqj8r1706LFc9l+Cs8=; b=iNEfbcuwDIpTDmtvi2gndQ3xs6fYEKeCZ3nx7UtsyTT9Tjg7WYBnhZ0IwD3K1dEtWwi/WUvtyqYB7cwJuHp4m8soMgmhCH68NiUcJc8ZlgjdFtBZ1yBiioCg5E2+McSW91vXRg3W7ocuArLbQIRuhxllOexzTzPCYjWKRCwzxAg= 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 1773009464187575.9333723016616; Sun, 8 Mar 2026 15:37:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMk4-00052D-NK; Sun, 08 Mar 2026 18:36:56 -0400 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 1vzMjt-0004Vi-OO for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:47 -0400 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 1vzMjr-0003Rt-KG for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:45 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so12193505e9.2 for ; Sun, 08 Mar 2026 15:36:40 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae35cf7sm20495415f8f.26.2026.03.08.15.36.37 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009399; x=1773614199; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OBGHDfQs2oR/GEstE9rCn+hZYYqj8r1706LFc9l+Cs8=; b=yoetW2HeoYFYoXjRKxHxy+fUqGZCAvSqMRpwf4f9qreTV6AuHF4U5/v42FqOULEyIJ yE+sPk6Tzb5Z5WDldSdqesp7PaP20R1EHzA+HGubwBI5uN20Jjq7kmXswppU6SFaoeK9 P4pwcKelFS8TgyCUWKlgQWipvSv1WlOZFihOSAmp4RwDIUjgZPAX5LwkWKOh9Dv9yfS4 Pcix8ypQ3VLEprlg8VNsz8JYwAanq+uymWAvPBUec4m2rqupvvYE07xwkAmW1aV87SA1 Fqb9Y0BFZeFC0x8zv+GVSEbJtgP4j9jJMJbWh5sG3lv5AgwF2n4cIVLzNA24OodRJHAv nmJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009399; x=1773614199; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OBGHDfQs2oR/GEstE9rCn+hZYYqj8r1706LFc9l+Cs8=; b=tLQgYcOeZ+jj/jAVIUIiINvYfjsVlQ318SFhNMAakx0BZpU5GESSa8SKe1iUxRD4Ig Y25xYxy0IqKXQ1+CAwcW86YBjD91BkoGzBxv2+Xa01NhLarbkBmIAL5LS1+Z0PHISRts qFWeweyDTjUHAEKfLzxUndgQAWF/hj31/9CBmexfvfnrMxdYTtCw4vTKx1IPkVsRPqO0 qxfQPNqeJDGhBpz8GKUJvHC+4zR46jx40P2xovNfiM7vo3MC5quVCy+HL8TmL+btZ0bl aZxzokiuoU9bYct/8eEuEiKRMxULMGh1JQ5+HJOygnKMaT1tA0a6sU4y9leBfIEX8Sks AiOw== X-Gm-Message-State: AOJu0Ywc8Uh18dyfV2XMR+HM4ZCe2krpsGv94obwbI/eA8YPttk0Emsq V7tXWdIbCnh2qnP9bwmymaKLFBvF2gptPA2mQJdHO+LuvwFi4BjN/wjYkFyQfXshj8dG5LZ2tsi 3CJ1zy0g= X-Gm-Gg: ATEYQzxi6SV7l7dCAi7rUxsr8kjsPnLfoNsBo9jXysIzz/fFIucYZ/f4BBjVqLEmD5W JOOpykRGes5CGYetFuIPHieHt1nYicjd3vn+6wx79p5qgRCRE1PAYEFxYVaT13yMWutTg081WBc EF6mYuNASOccKQwfT/3vW6QYMHR3us6hhSPkRDr8zuaHQT7eTDAP9ubk3x0KjynNa62v+DVwmDK KP/Q8kE7yLFaqIOkK7wEkkFbrHtfe/RnJ7ZLjk72wBugBK8eyQNZS5LSDjojfryhKhvvcCDnI8m Af5d0VD0wso5BK8DLYLh9Zc5ebUieX7pWgrcrMCK6GxFFAl3SfMdwA2t5gIdDxLhBwlOkIjOZ8L T7OFydukQvAk/gp0TydT9kyjWZlNzLGeHQNnFFkyS+6mx5ymZZIddDufjCUqta4LW05VKThMed6 kG60xlK6PEi65gYClKARhyqapwG/DBjIZwGI6vy0szzLsIaLfBiv+VsnYic79cUXJ/x0NXBfpPn WMgFQ== X-Received: by 2002:a05:600c:c166:b0:477:a978:3a7b with SMTP id 5b1f17b1804b1-4852696ae0emr142665085e9.22.1773009398700; Sun, 08 Mar 2026 15:36:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 18/49] ati-vga: Fix DST_PITCH and SRC_PITCH reads Date: Sun, 8 Mar 2026 23:34:02 +0100 Message-ID: <20260308223433.25503-19-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009465041154100 From: Chad Jablonski Reading DST_PITCH and SRC_PITCH on the Rage 128 is broken. The read handlers attempt to construct the value from pitch and tile bits in the register state but mistakenly AND them instead of ORing them. This means the pitch is always zero on read. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Message-ID: <20260303024730.1489136-3-chad@jablonski.xyz> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 8438a77de04..777a6b0a2ea 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -438,7 +438,7 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr, = unsigned int size) case DST_PITCH: val =3D s->regs.dst_pitch; if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { - val &=3D s->regs.dst_tile << 16; + val |=3D s->regs.dst_tile << 16; } break; case DST_WIDTH: @@ -468,7 +468,7 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr, = unsigned int size) case SRC_PITCH: val =3D s->regs.src_pitch; if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { - val &=3D s->regs.src_tile << 16; + val |=3D s->regs.src_tile << 16; } break; case DP_BRUSH_BKGD_CLR: --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009441; cv=none; d=zohomail.com; s=zohoarc; b=D4NAGYL3+R2hJNlzZIyL0UsDsRKzPNJk42M3mkyjEtRJqyTVmntcYSm24fIuH4HV1vlljR1n0wAyjo4Khhhqq/XCKotLGf9eQfiSq3u73MFsXrNeSEJzrSKcSM7TJ7nbtrmJS7/+tHRyMXDV4ZzL4lrDT1Q+VJu9h7dWKGiwJOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009441; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=b09sap+OGQMVeE1aTDMGBHHtw11LVdZGHOH7RYaf3uM=; b=InZyupSYLqqVERDy+n04KlNxKvLec9l2W/TFccT1zYd7ABN/Zuv1Y8jQsqTaghxO6s6ljSQA5OmiTn/2ZOdXKCm5MpZ0Cw0dGnkVvY/yKXRoV6DdTMHypJFgswQlUwIzfDayf9o2RBCTY7WEhv0H3lnNwt7aG/ri0CEOFupMEjQ= 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 1773009441940707.1420278046994; Sun, 8 Mar 2026 15:37:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMk3-0004ud-P1; Sun, 08 Mar 2026 18:36:55 -0400 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 1vzMjy-0004ZM-AZ for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:51 -0400 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 1vzMjv-0003Sg-3o for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:50 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-482f454be5bso111177205e9.0 for ; Sun, 08 Mar 2026 15:36:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852e38c013sm282732545e9.8.2026.03.08.15.36.44 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009405; x=1773614205; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b09sap+OGQMVeE1aTDMGBHHtw11LVdZGHOH7RYaf3uM=; b=LqjVoNPFBVYV63LFuV/LPnkWzmFVpu3lP8doX9du1HZENCFmSP00GUv9HkR34g7hux Da9cbhDlkyGo7eNr67IPmB5TZKbQtp7iCnLr2yfPdSWXS9/SerzZP6d1IdGzisjmLEEz gOqs4NmAFNr881zjsy47Zg+vF4KmhYJlrk3fSwC+wzpRfkaEdBhbUyaPDT1QhMHA2Ije 9Gl6+nRgw9vZBTHvwy70BrRCPWyb++VdEesfQ8LV4Q5EjT544mRMDIiOT5f7U4P3MkEG bouy2wJD+2EBXi9UMUW/CmJnc9WmlOzlWYE3dknFsRYLye2Ww4Bmu/bbinir5JESwWZb Hu4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009405; x=1773614205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=b09sap+OGQMVeE1aTDMGBHHtw11LVdZGHOH7RYaf3uM=; b=wwPKJeffVouEDKgTIczFWqrAnlUY6jQIcy2YpFHDlhJuCE3lL6IMICNrw4VSVuJwDZ rCJZUEvZYhwpxbXqF7h9KxKMCLJr+RgF0tdjgeaqzVqQKPl65flQflYXoR5ygvFFpSw5 HndmTKglRXsvblEJ6xQRXbGaV3NCAhtHOrPURqS2Z2cAJdQQg+r70mCQbHNTxAx4ckgm /LF3CLJCEPRWTJi6JI3jHrDzrVCxQi4fQcIcYujTRCPgYZ1CzjLedVuNUBvOypOFCfrc oZlb230bv8CrrOgOKFibgX+OxKg3pOtRaYuBfNDhZhMCDu/9zUPGlPvtk8xM2OzTx3ps RUNg== X-Gm-Message-State: AOJu0YwjMeO8jk2ux839RjSPletE7ItqXHOeyii19FDPcG5CttDP9WxA 4AknrYCrFFIikxPpXjVvkunHfAxU3giG5dH8mn2NETVyHnlwThPfsp3klLsb7NZv4isQ3oW1090 5CWec8Y0= X-Gm-Gg: ATEYQzzeVG5ASPNKWT0AEA2t27RfzhrTU4vc7BUgLMq8AbkNwFHNf6hFVyWTOPex9CD +3YDqHjLqqO+RJuMTpqYunXXFx5KEor2Alyt5LDn4r5r3pC1+MauZlMGw10fjCYVKbSc51N5iCY d00I5+l++d2lQLZUpyI5EBLRh+UEneoZwLpWCnTVKjvWaKPv07gdJffMhosrXybxzUxYzX3Ys1R 6US+syKC7VtGW+rKZkZ22IaYIYKcdpXmLCTru/s26eRzM7pl7qPP05aP43UnB3lKGkQXeRwFdrQ fYrBnF2MD/T23uxam2B+5B0a1D0naB+IyGq+aeqbQVqauC7HqsLFJ3Km9nsEH0jmjs9C2A+JRUl ODQlnJRbiLOs8Gr9Ym619KoQk2e1MQ/uLW67FRXWBhgijy3TJYiYv8T+fdjXgMljIvuXzt2pHqc ue1XHK6lC3ML+YemSQOU7GKSiKUkr1JCE8ja96w9eOTr/Tff7yh6HbRcV061E3Y5nLs7pIBdC3H QAEBA== X-Received: by 2002:a05:600c:4ecd:b0:485:3c2e:60d5 with SMTP id 5b1f17b1804b1-4853c2e648fmr10835415e9.2.1773009405238; Sun, 08 Mar 2026 15:36:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 19/49] ati-vga: Read aliased values from DP_GUI_MASTER_CNTL Date: Sun, 8 Mar 2026 23:34:03 +0100 Message-ID: <20260308223433.25503-20-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009444766154100 From: Chad Jablonski DP_GUI_MASTER_CNTL aliases several fields from DP_DATATYPE and DP_MIX. These were being written correctly but not returned on a read of DP_GUI_MASTER_CNTL. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Message-ID: <20260303024730.1489136-4-chad@jablonski.xyz> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_regs.h | 5 +++++ hw/display/ati.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/display/ati_regs.h b/hw/display/ati_regs.h index d7127748ffe..0a0825db048 100644 --- a/hw/display/ati_regs.h +++ b/hw/display/ati_regs.h @@ -386,6 +386,9 @@ #define DST_16BPP 0x00000004 #define DST_24BPP 0x00000005 #define DST_32BPP 0x00000006 +#define DP_DST_DATATYPE 0x0000000f +#define DP_BRUSH_DATATYPE 0x00000f00 +#define DP_SRC_DATATYPE 0x00030000 =20 #define BRUSH_SOLIDCOLOR 0x00000d00 =20 @@ -437,6 +440,8 @@ #define DP_SRC_RECT 0x00000200 #define DP_SRC_HOST 0x00000300 #define DP_SRC_HOST_BYTEALIGN 0x00000400 +#define DP_SRC_SOURCE 0x00000700 +#define DP_ROP3 0x00ff0000 =20 /* LVDS_GEN_CNTL constants */ #define LVDS_BL_MOD_LEVEL_MASK 0x0000ff00 diff --git a/hw/display/ati.c b/hw/display/ati.c index 777a6b0a2ea..028efd13e19 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -460,7 +460,13 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr,= unsigned int size) val =3D s->regs.dst_y; break; case DP_GUI_MASTER_CNTL: - val =3D s->regs.dp_gui_master_cntl; + /* DP_GUI_MASTER_CNTL aliases fields from DP_MIX and DP_DATATYPE */ + val =3D s->regs.dp_gui_master_cntl | + ((s->regs.dp_datatype & DP_BRUSH_DATATYPE) >> 4) | + ((s->regs.dp_datatype & DP_DST_DATATYPE) << 8) | + ((s->regs.dp_datatype & DP_SRC_DATATYPE) >> 4) | + (s->regs.dp_mix & DP_ROP3) | + ((s->regs.dp_mix & DP_SRC_SOURCE) << 16); break; case SRC_OFFSET: val =3D s->regs.src_offset; --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009426; cv=none; d=zohomail.com; s=zohoarc; b=mykbJCvdAHPEPSLD/ZsnOVz6ZQAxgN31knQVuXB3y7/LBKXYipSUhbQ7UNI4pYCer4EefL/IvtDRbIcw1R/Kl+3VJ+VbKNgPBTAI52B2wvgQN+Od37XvAMtnJeRsagDj/HTXx6JyoHO8g7+6nGkkBX6ShpN/d7bwwufGbun7hRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009426; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=JktwphMN4PgnByVHqZExV/IBtMZMC5cSUKOw+j/MPNU=; b=aCeRSpt7V0PLs0Z4nAR2BkAc3NML7Uj8icyT80+2wbOdSJWKeLZqPnEIfrH7e5VesLMKADGxFuKCv8OSLgbTQMNOwrk6/0h6CUplXGV5mGCzg8KpNIVclxlJ8BJxoARQDM5xKm2TQX6U5keVNFGwdWZVZFQb9TOCUmwRhlESdUU= 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 1773009426308473.71488201668444; Sun, 8 Mar 2026 15:37:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMk7-0005A6-8H; Sun, 08 Mar 2026 18:36:59 -0400 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 1vzMk3-0004sZ-Fz for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:55 -0400 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 1vzMk1-0003To-Kp for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:36:55 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-439af7d77f0so6948657f8f.0 for ; Sun, 08 Mar 2026 15:36:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dada9116sm20060351f8f.14.2026.03.08.15.36.51 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009412; x=1773614212; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JktwphMN4PgnByVHqZExV/IBtMZMC5cSUKOw+j/MPNU=; b=WpwzuoX8YnJ2rfN4crDwgkEOskJRfK2GtY7SqS6bPHlPeBKhLSHo1COlSVSZUbVNlR pJI+NAwTqVfRxtx7T413Na7D12LTFsqEfUzqw7AdCo3E9Yn5LBiXObXyaDtxVNeHEFxo /xl9YkFEze8o+9dGcilGiszspgfe00LG8zAFxUHzDHtvDdV0uYqgIonKrwe/aO8/4WYO c0O7g8gXpdJQh+Corz2TVKPueYkp2TDXCN1N527uNRjeKUBn24JJwC9ETf7ongUm5BrV nDRwBOx5wgAVPxSS9JC8SkjM5Zh61hFaZu5rFd1/X+G/6R7UrMYaFDq5BKYztNDD1lZc VFzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009412; x=1773614212; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=JktwphMN4PgnByVHqZExV/IBtMZMC5cSUKOw+j/MPNU=; b=dYoa19P/8S1FDIopR1Ft8Lsn/uBFX1//tsS6gdlCOYruytJWEyp4QtHSnY2570h7QE FiHyDwhrLkwSXi592CvwbCRsZxHezogWKJXUQETY0FibyywabtvAS+p0E2Eae309M4GR lmOFSm0b6S6TFa3hyAnXJtMjn6EwGmQSoNNXLc0CmjcdhCu4PlVzmayAhyJnBtW18Q7y bzmRqcLOSAJ42Fu7D6slWFVpEpNl/DrSmrA2jKOvKZL4gw6sgnlza5AyDe3GjWO4B/QI GcOKyf7Zq5Wv1yUkKL2M8zAU9V39i9UsDndkd9aURRhCsz8tPsLgF+V1RMzBS4Jac6uZ wUTA== X-Gm-Message-State: AOJu0YycINkjBXpHloUPWoMivvskpL/xWtBKfHYulz0OG0hTojUZQ8/V UfcjxPAuFKDCz3HRdQXC1IWEGs7ZKGaVTBrMiRH8v97oG41GCBzq/jWC3cd1YPiKfRum1KdoBq+ YR93kuHE= X-Gm-Gg: ATEYQzw0GbWdY9VW8luH4xFEyaZh74jX2fr4Hgb2oQ7TyUmSJnQy3PbVlcI6KQqOdQd PzdwiIw2c5hVBObBGOhM1CcrlldRFDKhrcLxnw6TPG5ACgBTUpIH7hUOnMCZTK1Z2bXK/UM7TJK NN9o47goRRuOBLCSKxhQ27eCdEfLm/UC1bkRyMj55H9eYmo0WIheqKaVUdl7DwbHYLEg4R1r4V/ m5kdVniyhTGoX6uy4MUtvABM9O6kEZ2oHe9GPwGeAvDoJKVVqOfpyzQo0lpeYkRpEG/jASvVoV0 2refKLIIYoukEfJrSO//slLKkmrArZ+8lHM9NaDfkSmLLmZWcXoz2SdjWZqu138w2wLS93zHMBR H5jzr5EXneQiWzTG1jDeqdP7p8VVBP1UvamsTxs0F1JDoo0i9uwxyBs9v5ONKqTQ7vaSfKcolAA jKUfkGzVC5apRhe0cUjzBmkE82MJ0F6SOp8dQBC3JIWTlgm9Y09WExfn9Hu9WnDzIcz9uw8G86c AHeFQ== X-Received: by 2002:a05:6000:2010:b0:439:d6ea:7cff with SMTP id ffacd0b85a97d-439da354a83mr18250595f8f.4.1773009411843; Sun, 08 Mar 2026 15:36:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 20/49] ati-vga: Latch src and dst pitch and offset on master_cntl default Date: Sun, 8 Mar 2026 23:34:04 +0100 Message-ID: <20260308223433.25503-21-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009428698154100 From: Chad Jablonski Hardware testing on the Rage 128 confirms that (SRC/DST)_OFFSET, and (SRC/DST)_PITCH are latched when (SRC/DST)_PITCH_OFFSET_CNTL bits in DP_GUI_MASTER_CNTL are set to "default". The earlier approach looked at the state of the (SRC/DST)_PITCH_OFFSET_CNTL bits when offset and pitch registers were used. This meant that when (SRC/DST)_PITCH_OFFSET_CNTL was reset to "leave alone" the old values stored in the registers would return. This is not how the real hardware works. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Message-ID: <20260303024730.1489136-5-chad@jablonski.xyz> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati.c | 9 +++++++++ hw/display/ati_2d.c | 13 ++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 028efd13e19..ce23e5e48b9 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -868,6 +868,15 @@ static void ati_mm_write(void *opaque, hwaddr addr, s->regs.dp_datatype =3D (data & 0x0f00) >> 8 | (data & 0x30f0) << = 4 | (data & 0x4000) << 16; s->regs.dp_mix =3D (data & GMC_ROP3_MASK) | (data & 0x7000000) >> = 16; + + if (!(data & GMC_SRC_PITCH_OFFSET_CNTL)) { + s->regs.src_offset =3D s->regs.default_offset; + s->regs.src_pitch =3D s->regs.default_pitch; + } + if (!(data & GMC_DST_PITCH_OFFSET_CNTL)) { + s->regs.dst_offset =3D s->regs.default_offset; + s->regs.dst_pitch =3D s->regs.default_pitch; + } break; case DST_WIDTH_X: s->regs.dst_x =3D data & 0x3fff; diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index 309bb5ccb6c..a8c4c534b94 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -43,8 +43,6 @@ static int ati_bpp_from_datatype(ATIVGAState *s) } } =20 -#define DEFAULT_CNTL (s->regs.dp_gui_master_cntl & GMC_DST_PITCH_OFFSET_CN= TL) - void ati_2d_blt(ATIVGAState *s) { /* FIXME it is probably more complex than this and may need to be */ @@ -63,13 +61,12 @@ void ati_2d_blt(ATIVGAState *s) qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); return; } - int dst_stride =3D DEFAULT_CNTL ? s->regs.dst_pitch : s->regs.default_= pitch; + int dst_stride =3D s->regs.dst_pitch; if (!dst_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n"); return; } - uint8_t *dst_bits =3D s->vga.vram_ptr + (DEFAULT_CNTL ? - s->regs.dst_offset : s->regs.default_offset); + uint8_t *dst_bits =3D s->vga.vram_ptr + s->regs.dst_offset; =20 if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { dst_bits +=3D s->regs.crtc_offset & 0x07ffffff; @@ -97,14 +94,12 @@ void ati_2d_blt(ATIVGAState *s) s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_wid= th); unsigned src_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_hei= ght); - int src_stride =3D DEFAULT_CNTL ? - s->regs.src_pitch : s->regs.default_pitch; + int src_stride =3D s->regs.src_pitch; if (!src_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n"); return; } - uint8_t *src_bits =3D s->vga.vram_ptr + (DEFAULT_CNTL ? - s->regs.src_offset : s->regs.default_offset); + uint8_t *src_bits =3D s->vga.vram_ptr + s->regs.src_offset; =20 if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { src_bits +=3D s->regs.crtc_offset & 0x07ffffff; --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009440; cv=none; d=zohomail.com; s=zohoarc; b=Hk6gREYSPzFqmhcBxxQv9964Adg33Y/WjDOK9X4sE3o7A5Qjdvqf0GJET3qSCiBMaQ3zbT1PJNeOJG5zHrLtpyTPMTS8FxOY4ts3k9JZ/Ng5i/VbBcDKe8TQ4orhA2q0SLRNBU8uH8Ul6znsJKRMHfxvGlynhtBJ3ztZfu3lnZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009440; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=YdraAJIIot1yfwSJGFLiSFzXGzYWkhfXgYUTmBdOKqw=; b=e5t+IvKOCcx+Yuj71i+VZEdWeJ+epTOnkyDgFiRWmQNqxkMo11dUg3ZO6uaAIM6AApZqUav5OX315buO5O5qr1vLHODdrDK37138Oz6WMJLzpfpVz9WhqxgZi8shDWrulhNShVfI2EJgrCWS1Z76VEXty++QbihzsPoIjfnsGRA= 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 1773009440904608.3331711832761; Sun, 8 Mar 2026 15:37:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMkI-0005Pj-8e; Sun, 08 Mar 2026 18:37:10 -0400 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 1vzMkG-0005I2-Re for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:08 -0400 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 1vzMk9-0003UL-KC for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:02 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4852e09e23dso11705685e9.0 for ; Sun, 08 Mar 2026 15:37:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485237f2d2bsm73353225e9.4.2026.03.08.15.36.57 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:36:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009420; x=1773614220; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YdraAJIIot1yfwSJGFLiSFzXGzYWkhfXgYUTmBdOKqw=; b=pivD5Y9G9jC/TvSLWrGcSjM26DSf/tn69h+XU7bYR9c1BKpSxx4rwTYS/CVqF3WtbJ TPuKOAQsK3N5OnDeaIzQ6+UBnQJ7U7QCQJF9pcy60GLsj6bYHILM1dtnnJICN0sQ/nQW 7qryXA3btH9gJC4ChgvyEVow0gcHfjLuPU7iZ6is0hjt/Nl3KOnUDzZl5UoVzhwUfryv tE7Y320atcUF7x+V+czucFRMlYSGclFseLKxM1niHbewnDzM6YyHE8CxcPgQWpkdLobr wo+erM4xp2FS/3IrCncdNVAgUs0aFC8iNOMMsE5nvESpFAtjaDnbYakR2izbxa6SFZsk sQ+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009420; x=1773614220; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=YdraAJIIot1yfwSJGFLiSFzXGzYWkhfXgYUTmBdOKqw=; b=ogpEU+WFaDgp52CDY+NYCU98euoPn0W/Ia770meZJ6AlUjYEjK6jka7Z5vyee8GgYa ozY5Bxqr6T0D96KwgTrF0jMwRivVcrEHW8YSfTin1zA7axFGZ+dUbZGmZGaqtftX/n29 +/cArGD163KJp2gU5n47LJ7MpkYi1TwD6UeLjqIq9+wyhIDzO0H/luMBwr6uErJ8Z90X jTMJY9wiqcHZjDV0TCB7t+eQvDtCcPqqfc7awywoXRAlqvtZjY4v7wcCRMADlx3DDjAQ dZ8HgYXluhpeH7Dv0V11laKgatu1eCRnorcYLsQdwlnHn6JUJe0E0u0mGJTiRS4M1vxb kXcA== X-Gm-Message-State: AOJu0YwlF3kh1a/iB/num3BX+K/42qDhFLTSIN/JBamFE74llu8IO9+1 eZjoUTnPXw/WzWgRs3ezXCzgOxlGUXo0xE8AdC2/WaP7YFYhyXad1WxWaDWMX6TUmK+v6+euuqx u5cy9MNY= X-Gm-Gg: ATEYQzyTE1cogGSPb/4tnWWA/nury0jqSi3SMRnV7BVQ5f5mQcFYIh4UhWjsda40+w/ cT8gWbgEwWOQ4sfDmXnuNhLp5OgPmQHdbjifJUzjMykbJbO907Vi+tatad3nh3rJ3GhLdx47vbR aOmBlzk0b7N8wS2A+GhPugZDBSiP1t60HSbu/SqUDRf3247FocoevHOWwekMk/IhWy8XgiaKoo/ cf+eEKTvUg2TQGm6NLyORTsojrqJjKdrT0rSjwx84SHtvbTzKO1jeDJl2FkJwi22pG+VpHnUp9U CHJZldETvU5wThO2ZlMz9/0OIeP4X50A90UKTEW3DLJ2sPgFxBjtO5PsUcD451eYOmzrUOKvTXh w0R1jU1PG3uR1hDwqWM4Y35yjQNtprL81J/7udC6VXG4NX6HGzLT8DIpQBG3cRGIU+joAPQcJaL itX1uvq5253VXz5omdlsmxRhRoXKTSFbUYdT5JWndjjUP2lK7HBvs6X5MbW2ZgLToZQVdbkIha3 Z9L8w== X-Received: by 2002:a05:600c:1395:b0:485:3b34:2f61 with SMTP id 5b1f17b1804b1-4853b34302cmr25177155e9.7.1773009419473; Sun, 08 Mar 2026 15:36:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 21/49] ati-vga: Implement foreground and background color register writes Date: Sun, 8 Mar 2026 23:34:05 +0100 Message-ID: <20260308223433.25503-22-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009441238158500 From: Chad Jablonski These are straightforward 32-bit register write handlers. They're necessary for a future patch which will use them for color expansion from monochrome host data transfers. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Message-ID: <20260303024730.1489136-6-chad@jablonski.xyz> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/display/ati.c b/hw/display/ati.c index ce23e5e48b9..26fc74b19b3 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -924,6 +924,12 @@ static void ati_mm_write(void *opaque, hwaddr addr, case DP_CNTL: s->regs.dp_cntl =3D data; break; + case DP_SRC_FRGD_CLR: + s->regs.dp_src_frgd_clr =3D data; + break; + case DP_SRC_BKGD_CLR: + s->regs.dp_src_bkgd_clr =3D data; + break; case DP_DATATYPE: s->regs.dp_datatype =3D data & 0xe0070f0f; break; --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009477; cv=none; d=zohomail.com; s=zohoarc; b=Csg73YeRRElDI79oD2dXBK2K/F9/zrMTOn9cqm+QF5KpH1M08jD36ImyMOmzrSh8y55xBDg+4Egn2Sfkhd2oK/TeFrQyKXqez2neDB8vo99ZG4h4pNRLTOZ+shZlKXU++oZl69zUa+rdiC4SB8cpjywz9etm9UkScAYpiIPFpfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009477; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=4tqix9hZK5KUL0kTLt7mTimTwZwRjziRtwjEO0THOpg=; b=FMbIPS9i5gAbWbPD2GYSGbYNsopVs5BRL+/ktzX8t5sgNrjYqHdoviJnL1jpAlMMxDVDUC1/ma5tnv0eOO78hkdPHqlTF4EQrbls5dMpsuX4BVWmrRk6Cz5Q5TFPpYS+UI/o66dODqWF2870PHrzbxnIH9CcMRvjJK7hZEvAo6c= 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 1773009477852474.2023314299088; Sun, 8 Mar 2026 15:37:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMkK-0005XQ-DG; Sun, 08 Mar 2026 18:37:12 -0400 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 1vzMkI-0005R2-EH for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:10 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMkG-0003UU-JK for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:10 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4806ce0f97bso98477215e9.0 for ; Sun, 08 Mar 2026 15:37:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853a310b8fsm52849395e9.11.2026.03.08.15.37.05 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009426; x=1773614226; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4tqix9hZK5KUL0kTLt7mTimTwZwRjziRtwjEO0THOpg=; b=DibqQ1hEDVqNfmBeiMfxup02t3Jm4zSHm5Ur1luBgHM32hfA9g/pHRgkZXYxF+ckvY I1DIg0oLQnCV26hKI0zELRPZfHNJb1R/3DpgtC62jKQPLWN/VNtLKOYjecdWz2JJv28G LKqjja9ai9gzo3s4nVmDzkCLTrdJp7cf95T+IVfnaCpbya+4dfm3wq5/MEKFwzIyQFLi fnB4qiRUbfFLjM3gR/yMW16zBOwmJ3YmMBGVED4c73pomvPG8NFgy+WMUhsgf26K0AZe gFajRJZb9nE4c1JitucVxiLavinCwOwELRyuQIDmp3zVH2GuP9bE9VdvA7gumZat6Z9E MvCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009426; x=1773614226; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=4tqix9hZK5KUL0kTLt7mTimTwZwRjziRtwjEO0THOpg=; b=VsZsiSLDbp8JqbHIcC/TB4OLr56s3ikJp/IjY6WmDyZKcGC8KqIQ2aRj9ymQejeasg UBXYFCyKQgNBgXLXBmhoi3hTTLlPj1A2MCSXOjZHoxcU565FqExSKyig68yz/AFSbZ9K Nf1hKZRElStk234OUADUkzMYjTe/c89R55hwvOM538rPGvAkSx+KySH7yoKaN4CbfwYN 02GFtkwIywA6Ds9MAShvFf0euVoWYQL9vanzKVaRwvXqkZZpMd0NYXklsm2a3xp07R6V xpRvy0EtKph8/GdzGkVFjKET79RJyLUPXC6Dxk21TEGnibQAylatHtkTaueZhWOLdLMb yf+Q== X-Gm-Message-State: AOJu0Yw1CgDHxed9pFybETOFP3e4gwCU8CpTqCXPG5BrAl2+BK7tcYVn VWVtHgXDGKwlOJkTN2zA86jmlM91OiNCf0AbLV7W5lvbMxYQhq+X3XcueBD4m52Duah0obzzcOq 2nnDNhSU= X-Gm-Gg: ATEYQzzBkSuxAQeezYEXS+UKSubXjnFnjrxPtoDZkcfaxqH/4hZ/Ko+iCFI154zC6Uf c3gg12YKsjOQlBJW3y1az3lrD05JMqUU/jQQYQyck8RHnGEpxY4hl5N4RnVwmeKy9CCQxKamFUf sQutGZguz0Xx1tkyCheJfqbgo26AjyxNCzeXNhnXynvri+P7+uCjQSMClEGiBQ6cfW0NoNqRPK0 VAwCvWYQW6MgfcRJg65WNH9EHNSatBrf4FD3nyJNFHA13U2w+oIMP9d9wtLs99+Dz084tel8Ocm t7VOqYRtlr9Ui0sBBlBH0bkYK6Q5tZM+AOMetjKphaH46WvulmeRf9xORL6T0zaB/4isjZ1uURV X8y2zvVDcNgVit0qEGIYgGsrOzbxS1dDrjjXukuB0Rtcejc/WADee8etlyoSXTOBMRQepegcmCT WhDMyHLiqiZKOVB7GoSNxV3Tdea8Wy9GjiXQCDczhtUhsLpwLMHU4j4qUgU7hCC1Rm+mI705d2x G3TxMkCdiwgqN8E X-Received: by 2002:a05:600c:8b5b:b0:46e:4e6d:79f4 with SMTP id 5b1f17b1804b1-48526927a4dmr152076035e9.15.1773009426052; Sun, 08 Mar 2026 15:37:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 22/49] ati-vga: Add scissor clipping register support Date: Sun, 8 Mar 2026 23:34:06 +0100 Message-ID: <20260308223433.25503-23-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 1773009479296154100 From: Chad Jablonski Implement read and write operations on SC_TOP_LEFT, SC_BOTTOM_RIGHT, and SRC_SC_BOTTOM_RIGHT registers. These registers are also updated when the src and/or dst clipping fields on DP_GUI_MASTER_CNTL are set to default clipping. Scissor clipping is used when rendering text in X.org. The r128 driver sends host data much wider than is necessary to draw a glyph and cuts it down to size using clipping before rendering. The actual clipping implementation follows in a future patch. This also includes a very minor refactor of the combined default_sc_bottom_right field in the registers struct to default_sc_bottom and default_sc_right. This was done to stay consistent with the other scissor registers and prevent repeated masking and extraction. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Message-ID: <20260303024730.1489136-7-chad@jablonski.xyz> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_int.h | 9 +++++- hw/display/ati_regs.h | 2 ++ hw/display/ati.c | 70 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index 708cc1dd3a3..98f57ca5fa4 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -78,14 +78,21 @@ typedef struct ATIVGARegs { uint32_t dp_brush_frgd_clr; uint32_t dp_src_frgd_clr; uint32_t dp_src_bkgd_clr; + uint16_t sc_top; + uint16_t sc_left; + uint16_t sc_bottom; + uint16_t sc_right; + uint16_t src_sc_bottom; + uint16_t src_sc_right; uint32_t dp_cntl; uint32_t dp_datatype; uint32_t dp_mix; uint32_t dp_write_mask; uint32_t default_offset; uint32_t default_pitch; + uint16_t default_sc_bottom; + uint16_t default_sc_right; uint32_t default_tile; - uint32_t default_sc_bottom_right; } ATIVGARegs; =20 struct ATIVGAState { diff --git a/hw/display/ati_regs.h b/hw/display/ati_regs.h index 0a0825db048..3999edb9b71 100644 --- a/hw/display/ati_regs.h +++ b/hw/display/ati_regs.h @@ -397,6 +397,8 @@ #define GMC_DST_PITCH_OFFSET_CNTL 0x00000002 #define GMC_SRC_CLIP_DEFAULT 0x00000000 #define GMC_DST_CLIP_DEFAULT 0x00000000 +#define GMC_SRC_CLIPPING 0x00000004 +#define GMC_DST_CLIPPING 0x00000008 #define GMC_BRUSH_SOLIDCOLOR 0x000000d0 #define GMC_SRC_DSTCOLOR 0x00003000 #define GMC_BYTE_ORDER_MSB_TO_LSB 0x00000000 diff --git a/hw/display/ati.c b/hw/display/ati.c index 26fc74b19b3..6cf243bcf95 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -514,7 +514,32 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr,= unsigned int size) val |=3D s->regs.default_tile << 16; break; case DEFAULT_SC_BOTTOM_RIGHT: - val =3D s->regs.default_sc_bottom_right; + val =3D (s->regs.default_sc_bottom << 16) | + s->regs.default_sc_right; + break; + case SC_TOP: + val =3D s->regs.sc_top; + break; + case SC_LEFT: + val =3D s->regs.sc_left; + break; + case SC_BOTTOM: + val =3D s->regs.sc_bottom; + break; + case SC_RIGHT: + val =3D s->regs.sc_right; + break; + case SRC_SC_BOTTOM: + val =3D s->regs.src_sc_bottom; + break; + case SRC_SC_RIGHT: + val =3D s->regs.src_sc_right; + break; + case SC_TOP_LEFT: + case SC_BOTTOM_RIGHT: + case SRC_SC_BOTTOM_RIGHT: + qemu_log_mask(LOG_GUEST_ERROR, + "Read from write-only register 0x%x\n", (unsigned)ad= dr); break; default: break; @@ -877,6 +902,16 @@ static void ati_mm_write(void *opaque, hwaddr addr, s->regs.dst_offset =3D s->regs.default_offset; s->regs.dst_pitch =3D s->regs.default_pitch; } + if (!(data & GMC_SRC_CLIPPING)) { + s->regs.src_sc_right =3D s->regs.default_sc_right; + s->regs.src_sc_bottom =3D s->regs.default_sc_bottom; + } + if (!(data & GMC_DST_CLIPPING)) { + s->regs.sc_top =3D 0; + s->regs.sc_left =3D 0; + s->regs.sc_right =3D s->regs.default_sc_right; + s->regs.sc_bottom =3D s->regs.default_sc_bottom; + } break; case DST_WIDTH_X: s->regs.dst_x =3D data & 0x3fff; @@ -956,7 +991,38 @@ static void ati_mm_write(void *opaque, hwaddr addr, } break; case DEFAULT_SC_BOTTOM_RIGHT: - s->regs.default_sc_bottom_right =3D data & 0x3fff3fff; + s->regs.default_sc_right =3D data & 0x3fff; + s->regs.default_sc_bottom =3D (data >> 16) & 0x3fff; + break; + case SC_TOP_LEFT: + s->regs.sc_left =3D data & 0x3fff; + s->regs.sc_top =3D (data >> 16) & 0x3fff; + break; + case SC_LEFT: + s->regs.sc_left =3D data & 0x3fff; + break; + case SC_TOP: + s->regs.sc_top =3D data & 0x3fff; + break; + case SC_BOTTOM_RIGHT: + s->regs.sc_right =3D data & 0x3fff; + s->regs.sc_bottom =3D (data >> 16) & 0x3fff; + break; + case SC_RIGHT: + s->regs.sc_right =3D data & 0x3fff; + break; + case SC_BOTTOM: + s->regs.sc_bottom =3D data & 0x3fff; + break; + case SRC_SC_BOTTOM_RIGHT: + s->regs.src_sc_right =3D data & 0x3fff; + s->regs.src_sc_bottom =3D (data >> 16) & 0x3fff; + break; + case SRC_SC_RIGHT: + s->regs.src_sc_right =3D data & 0x3fff; + break; + case SRC_SC_BOTTOM: + s->regs.src_sc_bottom =3D data & 0x3fff; break; default: break; --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009465; cv=none; d=zohomail.com; s=zohoarc; b=KOrnjd6o/CIJK4+eF14IGaJIM/O7iDDxtzGiUaCN1WQyOqWYpk1UUEqI0ZUnYazD6rfA+xQd/TF/58q/nQxV80zuGbjuoS0Ca2f4eafjMWY3/KLD7lGnHKG6UDyjYr00NvJUgVN+8SGdWbUI1H3mpZGNk1AiGJnOZGwtb9FxzWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009465; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=0NDQ7xzTuFz5bGabMlxPWKXWcVScfmHgx+o3wcMdHeg=; b=U/Vjhn6mye/yWE2igujx88U2nUT3BHvO4LI9eUZpUTGh2x727/v0zpszADNV+FCbkwinFDrdj99tmboFZwX7/LmTM9h3eXEVmHWw6efk66T376unfdSlXeSeXzYT9ZlEGE4PhPhUZmU7/7ynBjDecEO7MYTvWZbzhoZgTcJW6O0= 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 1773009465821268.1992554697241; Sun, 8 Mar 2026 15:37:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMkQ-0005f7-PN; Sun, 08 Mar 2026 18:37:18 -0400 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 1vzMkO-0005Z0-Ow for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:16 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMkN-0003VZ-8I for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:16 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-48539d21b76so4242525e9.1 for ; Sun, 08 Mar 2026 15:37:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae3d98asm23425939f8f.30.2026.03.08.15.37.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009433; x=1773614233; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0NDQ7xzTuFz5bGabMlxPWKXWcVScfmHgx+o3wcMdHeg=; b=TxSTPewUnUfEWpCbveedPGMmw/v5oStZa4Iba0YEHV+2V8Lxy16muaCcqlQN27Mj92 kbqyYRTFIqIfRKnaeU8uvrvD0cJBkqSPrzlJb2EN1k6CwMhgpYKwQaz0UNcwmwqo4TU0 5B/2owMeh/C4Zy1tjzczR3Rv+yGQLhpPGnfdgeu53Y7zWh3ZCtGdrIys3SXdt/JnZesW WaFUVrWZ7v0IYHuqlkdajrtMjdL+PbfvXSyL4MowXK9/l+dtNeyvJ7W9uIVEXMIsHQLe 05g5he/qJUpP2ZdItXJbyGCUFeJMS0FyUFU2PUbgLwmb4dpj6Kt/Yr2ABjbi+dFg8uT3 PCEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009433; x=1773614233; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=0NDQ7xzTuFz5bGabMlxPWKXWcVScfmHgx+o3wcMdHeg=; b=XiPDoOKXYKT/B1mwLXDrEsFI24HRDMOdKVqPCGwAJ+RCm3u4g1dc4GMAchKfAe69MM 9jBid2GXFyPDW7jwnh0dBKnn99sNF2vNi6tqwY4cbSaCK6rV2/UKkgshaY0yNo/9t3YI NKKjqrQtxpqxFEY/hRcGiaDEWtS0tC3Eme3Kt5WstqiXnrJ85oXaCsKs0Ifa+QRUzlc4 8cljNXMw0TagDcnK0dtFMfe/+SR8mQVkgQ9GyT08FE45iMvLGQ1UMXy9B3RvA5aXVADV VGz+AvrWWp+ypGP9hKSG0j9MWOoVgdvwnK3JL2L7p0pULF+L49f6Sljxqtsxgtr4+IsZ bcZg== X-Gm-Message-State: AOJu0YzS7HOsELMR1XsuJ1UGVVk4gzgWA/tQFn/3+GFMvIsujmXdr41f +YyfczAN5D6sMLy5qIb+y6cKBve6Ngo9U75ztRv2D+rqnN7P5UpQLi9fHflUwgSbjl6F2iCGfhC O9/H5E1Y= X-Gm-Gg: ATEYQzx/H2jpUt/3AVObnisSY9osyKwp2J+z57soX0UdblNLQ5xqOcEbJIOo5xeQfAN aG/Mxvrmz+u3t9nrjvrQBGvD7bxXkhvqTzQRv/GOZSfae8hx3QkQcYl5FSX2q5FioReIoGv/rwb bqdtcGrEM+WvhBE6/pagCZ4B+wbkyXiwQoVytLpUHyzrk6kKmtOSXNiwyImi+fjux4jUFEejTmj 0ETB7GGuER/dsFbd+r9NfZzemWaJ3JNzAutaq2QF9fjUEUMK6oePvlRKA2Lui5O/t6UB7YbGoFn +LHN2bhjghIKfjrjMlv8xpUPz8kOBpHQODVpG7bgMUrx2vNct4z+4GyVSlXyIWVRnTJ/rreQZ1S BqlI3x6BlBAjwtVvoUBOFEhbctRjXi4yw5HlZx5C9PjHtGJPhonJ6OV0ypaOaxwzHWQvxM2RxcE we/TDx+hedQGd02POY4aPI130LC+sXv6Cp90yNwYa/P22UjeZUYcFDO25xOE9jq+IJ5YGAlmVLl nHEka6/o8YRISJ7 X-Received: by 2002:a05:600c:3b8e:b0:485:3ae8:2231 with SMTP id 5b1f17b1804b1-4853ae824cemr33606175e9.30.1773009433445; Sun, 08 Mar 2026 15:37:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 23/49] ati-vga: Remove dst_x/y updates after blit Date: Sun, 8 Mar 2026 23:34:07 +0100 Message-ID: <20260308223433.25503-24-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1773009467309158501 From: Chad Jablonski The Mobility M6 register reference (DST_HEIGHT_WIDTH) states that dst_y is updated after a blit but this appears to not be the case. Hardware testing revealed that both the R128 and R100 do not update dst_x or dst_y after a blit, regardless of the source. This removes the update. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Message-ID: <20260303024730.1489136-8-chad@jablonski.xyz> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index a8c4c534b94..cfc7bf97899 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -174,10 +174,6 @@ void ati_2d_blt(ATIVGAState *s) dst_y * surface_stride(ds), s->regs.dst_height * surface_stride(ds= )); } - s->regs.dst_x =3D (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? - dst_x + s->regs.dst_width : dst_x); - s->regs.dst_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? - dst_y + s->regs.dst_height : dst_y); break; } case ROP3_PATCOPY: @@ -228,8 +224,6 @@ void ati_2d_blt(ATIVGAState *s) dst_y * surface_stride(ds), s->regs.dst_height * surface_stride(ds= )); } - s->regs.dst_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? - dst_y + s->regs.dst_height : dst_y); break; } default: --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009477; cv=none; d=zohomail.com; s=zohoarc; b=Oz92jgiYoDECXDJGp+uD7LWuGXI2yCdZJzsCU9HsjyKwB5aT9SiPqgcp+Q+BMksQus155MAUuEu5Y7b7YEeE0LiTaOwiidpFKVZhPVGRk2EpJRErRO/x1m0okifJWMInYbrKS3EnZj+BuwA2HcQXo53dxoLj7rfYKb4MPZlpWOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009477; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=pEcmCtk5Y5SmYmBzYXMrn+DWhfnlB/6nRRhyFttZBcI=; b=BrRPqoUXwOgeenNnBk8eKRyEE/NJdiqgYrjQmBMEQTuuEFVja9Woy7Co2TTDJTZ3ncCwYr/HMDq3r5qnuMDoIkjXKGd7L+v5TlnZZ5ldROoKnTOQ9Cj/NcMJBp9o1eB9Wf8StroPgduaF8kRRkU17yR2t7XwL4wk9fTqXc0YsbQ= 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 1773009477373513.7709176792879; Sun, 8 Mar 2026 15:37:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMkX-00063c-Sm; Sun, 08 Mar 2026 18:37:25 -0400 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 1vzMkV-0005vn-Lj for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:23 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMkU-0003WL-1i for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:23 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-439c4a93841so3617018f8f.1 for ; Sun, 08 Mar 2026 15:37:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae3f267sm20281131f8f.31.2026.03.08.15.37.19 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009440; x=1773614240; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pEcmCtk5Y5SmYmBzYXMrn+DWhfnlB/6nRRhyFttZBcI=; b=nl6Pub/HZe3mE+q38FT0QZlJD3LllaH7nt9mydaeSgfpgaBcZHSdlrQWcJNYDqSVOT VJH4BS93EY8TgUyMpcQDaiehp6y97rpeuyhzosIZM1N9niXfyx0ghTOOB/5/vodIvVP9 Ken5IT6fGWPaHyxGv4toQzwOeSxGWgSto0D288XoVC9VyOHBY7RRqUVIErTyDiQTqELZ JBXFyxgbPPUFTloomfgX5eCvg7FMFojZPnXcylkkzOHMFoc8Kzv/NjO5lwmffVZ2IbhY 0S61TrEzvhCXfHgUZU0dgPp57wjljD5pRDm5ryGXey7wp1RQDQzIhSGLAmHwLZ0iLFlO cgZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009440; x=1773614240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pEcmCtk5Y5SmYmBzYXMrn+DWhfnlB/6nRRhyFttZBcI=; b=ubvCyqBC39R6ytxibXjlNJa1qf6KiAnzhXt86Q0rTmQ7zjWz3ztABo0lPTWnqdgqPz ZulQ1hbueSH2Jxc0pw5j8COTFxlBUkpJOsu/y6RxFoVyvO0GKaDxXQB3omJ2XQQdtOfc dKrkYgjpi8ZXXFEcmKip6IWVRGCC05FdnoG7HAa0w7wocYh7IkS8AG9g3i/mzAx8P60y iU1Cly2qAmcBifUAm6ntQZVdwxAyesGHyNRJUfNA7uTtS90aW+Nj9WqUtKQ+F8aosA2p ebP7h3n45Gxbl3Tup+j1e3fBr63UsCyES/iCzt7c6lytj+q84ATdotpi3nsfxzDXVB+m SAgw== X-Gm-Message-State: AOJu0YyWXixW9Dxtdzxat+4XDL/ISpu7jJt0YjBGj8UPLKgVHc+CEW+7 csVWM5T0ZGMFurytZFPjbKGohmgGjwxm9paw284CfC1diX0mjEEOYPtgqFTWUIx8T3++/q0KDhp OCSbkcxo= X-Gm-Gg: ATEYQzygFI/XURpZIOro22vuy62TvXLYeGgG3wCj0JjGiHuiQeYfnCcDQYe8IIVn2qv LrbXmvXh9e/JzhAerx4hoXzWUtmK2YSiUSuNZO7tuVf4G+JkVq6bbZoDcQadLWqpJ06Op3QW/xL suvQfP4bwasVMVArXfisRBbu4Bf5lyGfBKue8LRFFRhiQa6S4inrbfVxlvwCSqYYCtcCGLtr6+C 16iGwVIeIKX0OCA4LE+0gBqDMeY9eDcx+cfgFHR2zV53641Pq873Fe70jmtMpdcca10wXRrCAno RwxbFG5zLDqohXwSrBnEjUHGBTG5BBR0RlHEB+hnzMkHn+ey15YAGNYb99UomAX38Iw84XilG6F TmSOTVVlv91IvPDa+I2HzahfFO9m6JB7chv79kXfjXNReP+Ko9KBLH/sxiJ4yQD99TGk4yXbYZj CUf8e/sLSyBGngoDg5ViWWRWGMbgr/BRJX0+R90Qm84OLwH+I9YhdbFq0FrNm3DNSz496qUlmf6 RxXww== X-Received: by 2002:a05:6000:2911:b0:439:beee:43aa with SMTP id ffacd0b85a97d-439da351b41mr16853379f8f.16.1773009440002; Sun, 08 Mar 2026 15:37:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 24/49] ati-vga: Consolidate dirty region tracking in ati_2d_blt Date: Sun, 8 Mar 2026 23:34:08 +0100 Message-ID: <20260308223433.25503-25-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009479374158500 From: Chad Jablonski Both supported ROPs follow the same memory set dirty logic. This consolidates that logic to remove the duplication. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Message-ID: <20260303024730.1489136-9-chad@jablonski.xyz> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index cfc7bf97899..8e192802d3a 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -43,15 +43,29 @@ static int ati_bpp_from_datatype(ATIVGAState *s) } } =20 +static void ati_set_dirty(ATIVGAState *s, + const uint8_t *dst_bits, unsigned dst_y) +{ + VGACommonState *vga =3D &s->vga; + DisplaySurface *ds =3D qemu_console_surface(vga->con); + + DPRINTF("%p %u ds: %p %d %d rop: %x\n", vga->vram_ptr, vga->vbe_start_= addr, + surface_data(ds), surface_stride(ds), surface_bits_per_pixel(d= s), + (s->regs.dp_mix & GMC_ROP3_MASK) >> 16); + if (dst_bits >=3D vga->vram_ptr + vga->vbe_start_addr && + dst_bits < vga->vram_ptr + vga->vbe_start_addr + + vga->vbe_regs[VBE_DISPI_INDEX_YRES] * vga->vbe_line_off= set) { + memory_region_set_dirty(&vga->vram, + vga->vbe_start_addr + s->regs.dst_offset + + dst_y * surface_stri= de(ds), + s->regs.dst_height * surface_stride(ds)); + } +} + void ati_2d_blt(ATIVGAState *s) { /* FIXME it is probably more complex than this and may need to be */ /* rewritten but for now as a start just to get some output: */ - DisplaySurface *ds =3D qemu_console_surface(s->vga.con); - DPRINTF("%p %u ds: %p %d %d rop: %x\n", s->vga.vram_ptr, - s->vga.vbe_start_addr, surface_data(ds), surface_stride(ds), - surface_bits_per_pixel(ds), - (s->regs.dp_mix & GMC_ROP3_MASK) >> 16); unsigned dst_x =3D (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_widt= h); unsigned dst_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? @@ -166,14 +180,6 @@ void ati_2d_blt(ATIVGAState *s) memmove(&dst_bits[i], &src_bits[j], s->regs.dst_width * by= pp); } } - if (dst_bits >=3D s->vga.vram_ptr + s->vga.vbe_start_addr && - dst_bits < s->vga.vram_ptr + s->vga.vbe_start_addr + - s->vga.vbe_regs[VBE_DISPI_INDEX_YRES] * s->vga.vbe_line_offset= ) { - memory_region_set_dirty(&s->vga.vram, s->vga.vbe_start_addr + - s->regs.dst_offset + - dst_y * surface_stride(ds), - s->regs.dst_height * surface_stride(ds= )); - } break; } case ROP3_PATCOPY: @@ -216,18 +222,13 @@ void ati_2d_blt(ATIVGAState *s) } } } - if (dst_bits >=3D s->vga.vram_ptr + s->vga.vbe_start_addr && - dst_bits < s->vga.vram_ptr + s->vga.vbe_start_addr + - s->vga.vbe_regs[VBE_DISPI_INDEX_YRES] * s->vga.vbe_line_offset= ) { - memory_region_set_dirty(&s->vga.vram, s->vga.vbe_start_addr + - s->regs.dst_offset + - dst_y * surface_stride(ds), - s->regs.dst_height * surface_stride(ds= )); - } break; } default: qemu_log_mask(LOG_UNIMP, "Unimplemented ati_2d blt op %x\n", (s->regs.dp_mix & GMC_ROP3_MASK) >> 16); + return; } + + ati_set_dirty(s, dst_bits, dst_y); } --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009485; cv=none; d=zohomail.com; s=zohoarc; b=cSsmxcK/p9VhU55yH1ApRUWVvmGUe34GBExjU/Dpwdw1zrOkrZq/egLefTCF+X0ULPrt67uTKIO3w6oP923m+qTWwGnPu03vU0x+7uQ6kwmlxHnbV938aMZxiczP5JGYq18e5kkTXmbrlU9FFPqlaWHyL6E9t7nHMr9f+qIqYXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009485; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=rwK2gpRx4ZMM6baKIcixqp2pUxMSXROQNvBnKyoazTA=; b=bl+mFriIx/wB8Sj3ZKdKVoVcXAj4AEBhSerA15TsdrwQ911dcLoGOr7UclDGPG4wFSZgSh9g14Y4w0a+Ids3xSTGoXrMHWxHqR/o0kO2P5UKRiYYbTkerUX/eX+jC4fns7RmH46vBVh4OKB1jpgblpBX2nOccUo5Zfs0khzAU/s= 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 1773009485947211.7965145003467; Sun, 8 Mar 2026 15:38:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMkd-0006RX-Dg; Sun, 08 Mar 2026 18:37:31 -0400 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 1vzMkc-0006NS-34 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:30 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMka-0003Wo-DL for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:29 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48374014a77so131497605e9.3 for ; Sun, 08 Mar 2026 15:37:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fae00absm290195735e9.4.2026.03.08.15.37.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009447; x=1773614247; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rwK2gpRx4ZMM6baKIcixqp2pUxMSXROQNvBnKyoazTA=; b=ibDbooAIs+rTkzYmxOU19UvO5CCppIJI19BJ6b1l/kDcBFvyDPGpK8FYh0wJ/+st4V gL8zb/1WzHWTDe5PVzH0Pj4W1XOv8gfbfNotE1phEykGfrs12XhQaxZ/jOp70r/WxbcN WTEtMnP7Yl9sxooVqA1pEMhwfrhgvtkyuXpozqXZPY82cGNiQyiJwbgATRylwjN19Ows bU+DRhl2245sKkEKai5pjwU81uf0Wp2YPykeYVJEOZklAvAnGUHI8GCGwFWjopTjqB10 gRDKk2ucItMsrd0TOjKYCFe3xkD9daFn1B11IwQzCKMl83NZDG6G4RiIv7UNdUjgGQsq XaIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009447; x=1773614247; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rwK2gpRx4ZMM6baKIcixqp2pUxMSXROQNvBnKyoazTA=; b=AnhsF7/Ee7xafXNqONkJzvtV15VRre6YK+ji4mUF1PuwMlGYDbSQebDMccfV0WILF9 R4AmRoAp88enQOgXUADON9NoGfZXo1f85sQQ2gN8D7j8fFgdB8nCBRCFQX+Wsr5IQeoj bUz7mdo84lrw7lr4+NR6qYXORAZ/nmf5Pf7/5v7NM+TSIhlGAYpfyUpl9eKTxlY9GPHq SjXoXtZo3Grj7zqbSeDZjmzJHaKhiaYW3HRptOlC54taHxnIci7EtSO3AgngXGnuz17H pkHkY0WSKSxNa5FN7wBwJr3hYvUj70HsCqmMKaurpRvDCe0XM/+jzsSEJGYnpwSPEauk MsaA== X-Gm-Message-State: AOJu0Ywv3cP7651DhJj1LR48QgqDNoE2utABFefqz2QKf74adYtfaEds +KrxlVOcnHapwljgf099a69D1RVYtNeOh0l0goAqA3U/3EC9BRBLz9NCm++c+iFYBoPD6k1TPSK r0wxd7KQ= X-Gm-Gg: ATEYQzxDXyTaDdBIfAgC46in81XJ0n7rftbTEWyHCCTmA4sFU5P+KraI6ztX34PyUjs 7TfbAaZOou2hpX6FIgQWsSQCsRx+9eYjRFTIiUdTWdcyOgPvX7rvhPPEioV4oa49SZMmnXuqqR4 J8L2S/blxUBxZqyPnkT5q7Z6+aPu7cjnl0oPl7U9ZGr9J+XiCZAgntbZfNtlfNxuto5GY/Wsf2L oUDxaikUF7piwblt5ONRNKGsrHQRXoSNhDYyzqvv92dtwueA4ejsq99kNc6l4aJqfu9rv514EPp 9BCbsQa4hVDRDjpjuuyNKoKS9wo2PmL1whNf05ThAvt6IzWDlKkTT5XYoi0CiJ6ppHnoeUaouji 31zf6XLkWrezEvRwYsYOR28JB7F2bCl3bwXTTyT1SfT0DUXykOVeqx3Vy4oSZvWYkg7Sx6YQJvN 5OpdPGlTBpBFhPhsciJrrEgL2TikcI2woIGNv8m+qdoQIzpf8Xli1j/IqR1vLCcWSAKnaPmAEAa Hwhig== X-Received: by 2002:a05:600c:3e87:b0:485:3e00:9440 with SMTP id 5b1f17b1804b1-4853e0094acmr902045e9.24.1773009446512; Sun, 08 Mar 2026 15:37:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 25/49] hw/net/xilinx_ethlite: Check for oversized TX packets Date: Sun, 8 Mar 2026 23:34:09 +0100 Message-ID: <20260308223433.25503-26-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009487341154100 From: Peter Maydell The xilinx_ethlite network device wasn't checking that the TX packet size set by the guest was within the size of its dual port RAM, with the effect that the guest could get it to read off the end of the RAM block. Check the length. There is no provision in this very simple device for reporting errors, so as with various RX errors we just report via tracepoint. This lack of length check has been present since the device was first introduced, though the code implementing the tx path has changed somewhat since then. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3317 Fixes: b43848a1005ce ("xilinx: Add ethlite emulation") Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Message-ID: <20260303172718.437015-1-peter.maydell@linaro.org> [PMD: renamed size -> tx_size to avoid shadow=3Dcompatible-local error] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/xilinx_ethlite.c | 12 +++++++++--- hw/net/trace-events | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index ba3acd4c77c..7ea194475f1 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -162,9 +162,15 @@ static void port_tx_write(void *opaque, hwaddr addr, u= int64_t value, break; case TX_CTRL: if ((value & (CTRL_P | CTRL_S)) =3D=3D CTRL_S) { - qemu_send_packet(qemu_get_queue(s->nic), - txbuf_ptr(s, port_index), - s->port[port_index].reg.tx_len); + uint32_t tx_size =3D s->port[port_index].reg.tx_len; + + if (tx_size >=3D BUFSZ_MAX) { + trace_ethlite_pkt_tx_size_too_big(tx_size); + } else { + qemu_send_packet(qemu_get_queue(s->nic), + txbuf_ptr(s, port_index), + tx_size); + } if (s->port[port_index].reg.tx_ctrl & CTRL_I) { eth_pulse_irq(s); } diff --git a/hw/net/trace-events b/hw/net/trace-events index 23efa91d055..001a20b0e2a 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -527,3 +527,4 @@ xen_netdev_rx(int dev, int idx, int status, int flags) = "vif%u idx %d status %d f # xilinx_ethlite.c ethlite_pkt_lost(uint32_t rx_ctrl) "rx_ctrl:0x%" PRIx32 ethlite_pkt_size_too_big(uint64_t size) "size:0x%" PRIx64 +ethlite_pkt_tx_size_too_big(uint64_t size) "size:0x%" PRIx64 --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009497; cv=none; d=zohomail.com; s=zohoarc; b=fH9N2I7Djr51Qm2Ch+H4EY0kJI4XyHqmgJmZJ+ThvJfIQcVKwPZ81zrsBN7eeRFVgj0d7yHXOWM9GshhYTAy2XPZZqXRP/fBCSTpvdVYCE80LrmIBjeib/JWDpazwRUvIsj5wdDGveek4mVdjIGdbf/SSODd6FHkETZkyrWgS5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009497; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Zp4tzyYE1+SHUwjfn9CYbM0y2EMXsnd90/WhSxnB9Vo=; b=ANe7Ryi+09YtnoljdYjgSVEqyqwgUVorcFY6AH61PgyK2uZHumRZaQ/hK8pNAbrqyHNtypX+jHbJBrxXsUpP0a50el2ezf8/W0hEYCCvd8TW0sQwxlXFOCNtr1tnsh0fI8nZkg5UroBEAmEWnlLpj5ZgTDUoMVqjswqIsr9/boI= 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 1773009497710905.9989450239588; Sun, 8 Mar 2026 15:38:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMkj-00076Q-C6; Sun, 08 Mar 2026 18:37:37 -0400 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 1vzMki-00075E-H5 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:36 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMkg-0003XL-SM for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:36 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-48534b59cf3so5313385e9.2 for ; Sun, 08 Mar 2026 15:37:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae56300sm20799956f8f.37.2026.03.08.15.37.32 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009453; x=1773614253; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Zp4tzyYE1+SHUwjfn9CYbM0y2EMXsnd90/WhSxnB9Vo=; b=hISQ7PBh53iRkHaENbIZPSVvQsuOA0TnwbODQbepQ5YJEeBi+Cz+KGRrjr6vyiJRFf PA9SdeQsMPI9/TfN9KMfXy8WD5m8ha/8aFDYVUYLJibvDL96LYGk5RW9gymoDGbe4HnT SMjTgKXx1lBcd6dZ6Ddu7aQcZR9yQNX3kUeyo6bYyR+mRIDceQFW2fMjrGSor+3xKrUq hF7S9iE7VuuPk2TXpbANym7nO0lvc0u7EiC1uufQOS2XwCimF49fyCXgoh1o36XSctul Y2A4rl8nLUanKk2xL6Nwtd4iKWy0Sq7LJBZis8Rq0cKM5neD8fktIjGNX3wbqmwMTSfu ikuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009453; x=1773614253; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Zp4tzyYE1+SHUwjfn9CYbM0y2EMXsnd90/WhSxnB9Vo=; b=kXMEPPrXW84c6nKwHAec7kNTqRMyDLBDlE2jnZka6h4yLP0J1L6wUE6LtMxxlytJBN 4bAB4pJaMUWRgWBlOAjP+uXCIWZ8ldp31gyeWCDEKEmBavaQYehekOgoqk2mnv4cBr0d VG4MiFZQslBJY+dTOHy2QPId/AOZJXmHqUgtFYn5jpO+OlD2rPiER6+FxB76cLacmBlH 5RmGWU/6hxBD1Cx88WjRrnqFdnTmJ06X+rI5jddJnsijGLCyfoQOpVmCxz6WPX8H/SmV 6jI2W/ekIr6snfP6DOIKAZurI4VQQarmdNyjITj2O8s2cMQP8ny/UJoV73Kn38EAe+O6 rEoA== X-Gm-Message-State: AOJu0Yx+C1U38+4e8f2Ho5iqxVly/pCcxFHKPuOxS+jzHB1eZI5wUf8q peA85+8zp+i6y9Gv06KkbavAatwJm9Mw3nsHEiLcNIYKs82Fk0LwPNeSMyh+hpQXdEHIrwcyTCL /N0T78V4= X-Gm-Gg: ATEYQzzT1k1aIjspPfiH/jaNTPJADmv7sKXZmpowGUAD/Bs6EA9hvqba3rKy1fEXwL5 VhNSy4z0Q1I+y82ZoWLc0T6Fqas8WjGNrlcUgPHI5eksgYSLxcZI2tvoSmon6jApoeYMTBbsI/5 QDalRlZBVOE5nDCDWoKu2By71aWG/rkZju2UGNHQPWrvftLkAA9RB8kOTBzw0kDmlgtbk7p5gvg tBQLjh0XhKAqLp4CaNRbHMTkv47mdW8z6orI/yFuM87V586NOCdX51/nnNJHCpaLQUAohaoEWlO Y7yToW0vZACXKsYF0V+B/b3og2YgrfHBOKWvnf0dRgu63pvUhicOzJkppSEvOmBautCfQVJ4LOM wauVwXHd8RermCfUOYbROVShSbla/wdozYPKC4JDB6E6OEPwHdDmHCIFLY/U5A/VH/Ig/ZyrMvG e3KdqL9Qbalyl4Ykdx0smWZEeD1VJ2h1W67vfK1Lz/MTX4L2x1CQILSeHjKAi5WCLks7vTl1mC8 qquTzuUJwNkt9/O X-Received: by 2002:a05:600d:8497:10b0:485:2ce2:4c8a with SMTP id 5b1f17b1804b1-4852ce24e86mr74582875e9.1.1773009453042; Sun, 08 Mar 2026 15:37:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 26/49] MAINTAINERS: Replace @tuxfamily.org address Date: Sun, 8 Mar 2026 23:34:10 +0100 Message-ID: <20260308223433.25503-27-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1773009499513154100 From: Thomas Huth Tuxfamily.org has had many outages in the recent years and will likely go away in the near future: https://forum.tuxfamily.org/post/3381/#p3381 Thus replace my @tuxfamily.org address with another one that is more reliable and hopefully will survive longer. Signed-off-by: Thomas Huth Reviewed-by: Gustavo Romero Message-ID: <20260303203044.8403-1-huth@tuxfamily.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6730cee490c..5ad5918d7aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1357,13 +1357,13 @@ F: gdb-xml/loongarch*.xml M68K Machines ------------- an5206 -M: Thomas Huth +M: Thomas Huth S: Odd Fixes F: hw/m68k/an5206.c F: hw/m68k/mcf5206.c =20 mcf5208 -M: Thomas Huth +M: Thomas Huth S: Odd Fixes F: hw/m68k/mcf5208.c F: hw/m68k/mcf_intc.c @@ -1373,7 +1373,7 @@ F: include/hw/m68k/mcf*.h F: tests/functional/m68k/test_mcf5208evb.py =20 NeXTcube -M: Thomas Huth +M: Thomas Huth S: Odd Fixes F: hw/m68k/next-*.c F: hw/display/next-fb.c @@ -3088,7 +3088,7 @@ F: audio/paaudio.c =20 SDL Audio backend M: Gerd Hoffmann -R: Thomas Huth +R: Thomas Huth S: Odd Fixes F: audio/sdlaudio.c =20 --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009490; cv=none; d=zohomail.com; s=zohoarc; b=ZGWiq0WXG7vrOxb6yF4l/f+dnnNi0sm/HsyNDvJF2LapRs4Cg//cSzt5wSEXwUYilb0imSUy1jjuvSTQJf+Vo06U1E0vzEyizKtcHeEsHdIe9ju7BtkXuUFiOc73e5J3WHI+PAt1K8fZcOyLb8AR8Ta216JLz/MsuwHWjLBq0G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009490; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=kiXkLBeQWQKoj7IlzFSGI43nRrJ9AlMDgSZepH8qr+E=; b=VMjjryp+5a11jdt3wmEkC7FB6Mcn8ETaaX89lVesw4Wd36NM3eKN9fRD8arFWswjuvXH0oPPBTLdQiycd6gfZNUJMclukGF/krEjVlCjiLYRvRtlI48WPMcHoZ+o0skczfk1uwRXTZweN72oHYM9062anxfiwUnhKWu5PmEsHkU= 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 1773009490691764.2687908479273; Sun, 8 Mar 2026 15:38:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMkr-0007Qu-BX; Sun, 08 Mar 2026 18:37:45 -0400 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 1vzMkp-0007IB-HX for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:43 -0400 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 1vzMkn-0003YF-Sm for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:43 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-439b6d9c981so5066693f8f.1 for ; Sun, 08 Mar 2026 15:37:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8daf2sm22407232f8f.2.2026.03.08.15.37.38 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009460; x=1773614260; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kiXkLBeQWQKoj7IlzFSGI43nRrJ9AlMDgSZepH8qr+E=; b=PeHcGVd+F/eRuIpqLSIUT1IoGdmfVgfhXqGycoWhVabI6rXvIYq5Xv/iIhHd1QAvu3 11e48CxwMeXDLWdDZ9ryuHG4VdjvfDLkwVVvIjt7bZH+7yQQxuX1qc60KzO4BmiLyNhP HG0fdf7vZDiCrhFd2iO8lp6h9+px2nvHWLJ4Kp6Djz3q7bDjvE2pTaOU7/3YKtnWx8BJ rpnil51cua6FewIlinKOMcqrELxNdJgeyIZtBQcHtQZbs79RcnH1fsDxOSjvEGGSG51r w16YptUdIvNe8gLigUSZJhHDMDxNolxOdXrsHUXifUp0qSPL5wrVCmVhII3i53D7Ow4z OgfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009460; x=1773614260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=kiXkLBeQWQKoj7IlzFSGI43nRrJ9AlMDgSZepH8qr+E=; b=DFL/jKcGi8zu07WGye4/ySIvDqkNKoaCVqSvRJWfg+J5L0ldOjuqB/ccq83zTkfC5/ 9sBGp1TnTUaZ3/ZQIeDP6oOyBYGLgP6NLNn4LYZ1HIEMg8DvFjURvyuuk6f8vsXupkT3 qhJNdEj/dvGPWcHZNd39OXyhPC1SiMJTBjBuzTi8PHY1gJC3FKCmxYC91gysy1HnjJ95 Q3phTsFilKi+9bmVpV3mYDbAJtpitiFzCabDOKrF2jwWAhBHe6xMlC3Hk6bqDeioJ5Kv Px/KIhX01hZfp8Mx5pLE82Sv5+HBWS+p2ahhue7DndGBHGh3XDF3jP/Xbx0x8GklZUTJ BqNw== X-Gm-Message-State: AOJu0Yw/c0PKSVrTxHvmuxFmWqEwRi8jlDkahDTTpVGEKZFZzKX6Ci8C EB6hYbhZrB8gV/gtA9uAvIqyxLOqJxuDlcdi3Nki/LIPIQ/1KrLseIyXJKPV2xE7HXJtxw+R5Ou qBlgeMTc= X-Gm-Gg: ATEYQzz5mK32QwdNok3UsvGOBc39UBqMUTYj9Y3T+day1iT19U9+fZ+3GAxsqGoyZSS YzM9LPaaoVz8+YjbzDFSHfwg079DP9P+PszHbAcdU/z7W6Us35LNbxAS7dP1WCRDqbScdoQroER 60cRE1ceC3SblsUOGBSLyi3nWn/oslY0K7jhDhV96ZdGjfzQri4WjKg5uVmAcpkApM0t/7PlfXJ b2QnS5EAkRe9ASY8wgTvwzTRBMK3IPhLQLX3V/+GLAPM2r6ZPqkp4XlwUAuSIv0leTx+BtsCC+5 HNcJO4OjfBs/uBvYKn+Ec4f3I0aHeMTEM4SdmpiMBMGQ3Qv0QJnulQ7YGs6PN4L+Ky2A29WGXrQ oNW+IHe9wBrmhBhaDNh5EssKfw8UqaUVd4dg2VQE2kIGbi8F8E8CyNUeUywbDKWVsT0hDtsZARK o6rGxvGu4Kw9UyY9ZS3PPo4Ht3oT6iWMRjPiUwc2qbkYxWFxP1PWlvMvhPw/IKE5AvLoC4d4FIg Y/yCODQuAU2/mTh X-Received: by 2002:a05:6000:2285:b0:439:cd10:192a with SMTP id ffacd0b85a97d-439da657cbfmr15903699f8f.26.1773009459641; Sun, 08 Mar 2026 15:37:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 27/49] ui/cocoa: Do not automatically zoom for HiDPI Date: Sun, 8 Mar 2026 23:34:11 +0100 Message-ID: <20260308223433.25503-28-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009491436154100 From: Akihiko Odaki Cocoa automatically zooms for a HiDPI display like Retina and makes the display blurry. Revert the automatic zooming. Signed-off-by: Akihiko Odaki Acked-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260304-zoom-v2-1-2eebf2b51106@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- ui/cocoa.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 5b21fe3aead..9093d1e408f 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -627,7 +627,10 @@ - (void) resizeWindow [[self window] setContentAspectRatio:NSMakeSize(screen.width, screen.h= eight)]; =20 if (!([[self window] styleMask] & NSWindowStyleMaskResizable)) { - [[self window] setContentSize:NSMakeSize(screen.width, screen.heig= ht)]; + CGFloat width =3D screen.width / [[self window] backingScaleFactor= ]; + CGFloat height =3D screen.height / [[self window] backingScaleFact= or]; + + [[self window] setContentSize:NSMakeSize(width, height)]; [[self window] center]; } else if ([[self window] styleMask] & NSWindowStyleMaskFullScreen) { [[self window] setContentSize:[self fixAspectRatio:[self screenSaf= eAreaSize]]]; @@ -685,8 +688,8 @@ - (void) updateUIInfoLocked =20 info.xoff =3D 0; info.yoff =3D 0; - info.width =3D frameSize.width; - info.height =3D frameSize.height; + info.width =3D frameSize.width * [[self window] backingScaleFactor]; + info.height =3D frameSize.height * [[self window] backingScaleFactor]; =20 dpy_set_ui_info(dcl.con, &info, TRUE); } --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009477; cv=none; d=zohomail.com; s=zohoarc; b=l2wNMvmNsqSRfvPv/bMaSG+FERY/qTSoMw7b0EUfL1YbsLeK9NFF+TaXe0/jMMDKmyCjtgmEQaAnT+8NJToFwfJNf9mAqY96/gXqM7BH7pIUZggtu46+/mxjJo7bqwQ+R4rBKQ8HHFBWXZFs2lVfAZ6GMId6RcXwIc4IrXT4ARk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009477; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=i20vJNc5d6p6GTvYkEwQZHERtzs5jfNRGw8++gGe1Qs=; b=ZALhq7Ts/5WFSLUju5ZQUOENAkwAkcME5TcIDWiukYn+aA5qZVkTzQB1LyJbHd5uxGfeCa6m9MHllMV7nXiDq24o6qHdxJ2rYBdu7m0UFlFhSxNVA0leIJkLBMBctuEVQfPRR87+ufKrBAXGr9kAtA8dh78z0pRworWalSly5b4= 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 1773009477425469.6701688967149; Sun, 8 Mar 2026 15:37:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMkz-0007su-SQ; Sun, 08 Mar 2026 18:37:53 -0400 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 1vzMkv-0007kn-SQ for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:50 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMkt-0003Yy-WC for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:49 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-439c6fc2910so3360724f8f.0 for ; Sun, 08 Mar 2026 15:37:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8dbb3sm19132623f8f.4.2026.03.08.15.37.45 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009466; x=1773614266; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=i20vJNc5d6p6GTvYkEwQZHERtzs5jfNRGw8++gGe1Qs=; b=DGOnJmLXX/ABFBHwggaqwP2je1bFeHRuNOvHwkhjN4CM2X+Tkpy91526AGnAlSXUql OuKpbvXUxmqPjFlhDEq2kJbkEIJH+rYJQKNUeAu5d23kLfimSAQy/aKFoAC1oTTW/fVO CrZDixkO3W2ZdSy6bWmnwiqow+IcmwsQm5B2Vbyn+77weJq4csfi77oPDlMFRFfEK7c9 fwOcvbChFsxbJ8MVxDcWGQW8kvaKdUZ2n2BhhaG2/cVIBnSNgN1MRNaqQQRuF9qmgwCJ G22wjQsQLh2PsQCL4bC1pXRQ0ip/1/Fz/THFQ/ml/tPHzsUxOYjSRWCPj5C2uZ56kxqK RQPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009466; x=1773614266; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=i20vJNc5d6p6GTvYkEwQZHERtzs5jfNRGw8++gGe1Qs=; b=qfGB6NQDpBjfHwwwGD1DBNBsBo+p1yLVNyoFxmpNINr+0I+0xwbyUwC/+9eky3pexJ lBnIKE/rZWfv3WetUeIeh5jw0qUvwaWrjcMzM2EXZRtJnPglH5kZEvRg8remFz08x1f1 8B7/xhWyPHWzC8nUdzG5RR5LC54/doRKsc360eq/VfZUdAAJmwj28js1mZ3mEQGRHYf+ ClxhvFL0PtPM0OOuM3XNKjquYy9diilF2t9UOWQyO6nCTlaOZpih9jeEUmernx2HGQZZ ndL7YKJIEtVrBIj6sy75vCyMqStfKlEddHgPnQazmYnn786l29s1JOWBvgbXyKI4zUPP jPKA== X-Gm-Message-State: AOJu0YxK01LlGR4DP10IUIY+t2vqSIoi7ck+GBp2jIgGoXt3UN/sQ4B3 xY77l/IsXOIzG6Z5uG0rCwwB220mZeuWAzZqQwVKUuQ1RhV8GUWwPxNx48Z5YPwVHLp9fdH7wF2 pW9gw4Qc= X-Gm-Gg: ATEYQzwCrukS3j0FRskZFDBCiANIJHA935Hg7u0R5DTNHh/dWfttEdPCxgtVNnxLcZy wIiBU6ZjUohh8BeiFLKScE5SMamItuR6pYqdVZdJ+PtvUncjmYn/dS469IN5hxguvK1oADX+mZ8 bUUNldxizKWK2MOap8Sj+t1r94k3fWoAQW2+qPN57fizzKtzC/p+g2r+aZBAaPShiYlHzepCkih 5/sr51cUY1raWCyfeEbJPXMOC43yjYoWdjCOmLl7JDOs1+Opx+c1kVNGb5Ys71X5RtfnN0oRBqh aKW0zRwDSdYg7w/+cKlBgBGxvRVctYNWVc5DN9d2NIFY/jvdQYSAl8972Mwk9OOa1IMpHWtYQ3V r6htiGBmnA++5faWI9I5Zn6+LSvC45PnwMcVlfojpgzQRRAmPb9eXPght5y5PxAE2wTV9OVr4jl 8QjH/foL8Ceh8F4nlMHldU4Nqly56ImXzOHE8c2Zvnl026d1WNcoV37iJVYfuFss2139mZg4r/N Kx43Q== X-Received: by 2002:a05:6000:61e:b0:439:cbf3:4a8f with SMTP id ffacd0b85a97d-439da67a8c4mr17863014f8f.41.1773009466117; Sun, 08 Mar 2026 15:37:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 28/49] hw/uefi: add variable digest to vmstate Date: Sun, 8 Mar 2026 23:34:12 +0100 Message-ID: <20260308223433.25503-29-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009479239154100 From: Gerd Hoffmann Add digest to vmstate if needed. Clear digest before loading vmstate to make sure it is initialized. Fixes: db1ecfb473ac ("hw/uefi: add var-service-vars.c") Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260304075954.584423-1-kraxel@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/uefi/var-service-vars.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/hw/uefi/var-service-vars.c b/hw/uefi/var-service-vars.c index 94f40ef2368..5e3907118d4 100644 --- a/hw/uefi/var-service-vars.c +++ b/hw/uefi/var-service-vars.c @@ -37,8 +37,41 @@ const VMStateDescription vmstate_uefi_time =3D { }, }; =20 +static int uefi_vars_pre_load(void *opaque) +{ + uefi_variable *var =3D opaque; + + /* clear digest which is optional in the live migration data stream */ + var->digest =3D NULL; + var->digest_size =3D 0; + return 0; +} + +static bool uefi_vars_digest_is_needed(void *opaque) +{ + uefi_variable *var =3D opaque; + + if ((var->attributes & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACC= ESS) + && !uefi_vars_is_sb_any(var)) { + return true; + } + return false; +} + +const VMStateDescription vmstate_uefi_variable_digest =3D { + .name =3D "uefi-variable-digest", + .needed =3D uefi_vars_digest_is_needed, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(digest_size, uefi_variable), + VMSTATE_VBUFFER_ALLOC_UINT32(digest, uefi_variable, + 0, NULL, digest_size), + VMSTATE_END_OF_LIST() + }, +}; + const VMStateDescription vmstate_uefi_variable =3D { .name =3D "uefi-variable", + .pre_load =3D uefi_vars_pre_load, .fields =3D (VMStateField[]) { VMSTATE_UINT8_ARRAY_V(guid.data, uefi_variable, sizeof(QemuUUID), = 0), VMSTATE_UINT32(name_size, uefi_variable), @@ -49,6 +82,10 @@ const VMStateDescription vmstate_uefi_variable =3D { VMSTATE_STRUCT(time, uefi_variable, 0, vmstate_uefi_time, efi_time= ), VMSTATE_END_OF_LIST() }, + .subsections =3D (const VMStateDescription * const []) { + &vmstate_uefi_variable_digest, + NULL + } }; =20 uefi_variable *uefi_vars_find_variable(uefi_vars_state *uv, QemuUUID guid, --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009504; cv=none; d=zohomail.com; s=zohoarc; b=ShY9Ha+0oRbcWs4Gsq+LQrr/ecgkq7R7EJ7PwJTwt6p2CoQfx6wDzN41c7eZIBTv2YWBLpdfsUwB9hhrB65vNZdCqrtM9+XVrBArvrhsNB/tcWrsnxoBUCN/hbtk5uBdhPlToADhnDCu2vdQ1SIe53Gdn4bECVJRwge2xuI2hIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009504; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=M77BldNhBLWDAqoR5Ls4NYc5x77VJRLwJ22XVsrrWUA=; b=IOBr1Jk3xvhUf9kRsEzM7VA3pSq9YtFKE4Xxl8uAFN/dzgi5W71/4rUj+IbQtLyaRTvpGdnoqdahH0J/Pe5OHOcZEKnTYwV6kAJXguAtKGr3Po6AjSg2yPkBodgzk1wl5Ao5IJxgZme9lJk8FfIzkDDECZq+cA2YKJUmsI7c5No= 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 17730095041701015.1013170852668; Sun, 8 Mar 2026 15:38:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMl6-0008St-Lw; Sun, 08 Mar 2026 18:38:00 -0400 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 1vzMl2-0008IG-RB for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:57 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMl0-0003ZS-P7 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:37:56 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-439b9cf8cb5so6649322f8f.0 for ; Sun, 08 Mar 2026 15:37:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad1cb7csm21421438f8f.0.2026.03.08.15.37.51 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009473; x=1773614273; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=M77BldNhBLWDAqoR5Ls4NYc5x77VJRLwJ22XVsrrWUA=; b=HmXYIYrGSHbyGoh3i2b68BksumpYNVC5LdMkKWsN2zka3wZbtSIdUoLLEyZw/jXhjA hXweMrQWwZpFadlruGI/bRo5aSec+IuRoGEqey7Rz9kUDR9BTHJPuoFUrbAtWzySYRqT olRrwpSSb3uVOU5Ql4CRKPS9HIWuAm8rUvGCjPBXXZAIbYGx9WQ1DfCkwHHe8t0U2sg5 4BSevY730UI0J1GQm/wCV0eW8vtbbGNktSk3T7LfyIHLcVlKGogrq/OtC49SMGazUqXl 8eIkFZW/8LFj5uaQfm5qga0unp1fOLKMF33ilkuEYmYzSfpIn8DtX9O5+61EcrIxylc+ dtEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009473; x=1773614273; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=M77BldNhBLWDAqoR5Ls4NYc5x77VJRLwJ22XVsrrWUA=; b=VxJsvvFhUSg9Hb/SfVjZmQpqzf1qtlRW4qB9MN2VYIVqwr1rxViKnP7VWq0CXzIbMA 3rjbiEhrxDWDYyWXzn6Q3ekIK8eOVit0nD0QBKzMVvjG86/DQTBubF+7eEF7PiV5ZAGm gPTOhph6iIg80TTZB1gfO/wBd06qMIaJ0aG4VF5OSa3c3EUjkV+mFkMl40xbFblQsbhA J8AnRMm+vWcJJ9ZIpAf0Tx5g1HKBvX9kORA2ACRvdNk/r00D7Q/3jD9ejFQK1mx6GZo7 GByUu/OYfjjeidYqcrjEWM8zJHaUpfSv1mfYKcg7pHt+2UGznleOwAZ4e9d1R0Fj7lYj +8ig== X-Gm-Message-State: AOJu0YwvQvUqgT9rltwa8JAJcEqChDmjNisnRQZNwFonC6R3erm6QaYz jOIa2iF0ZG8eRKtJbG/oAEe/I7pve656xzu9DRslbnuSOiUIqh9D+IMxIHHc0D1EmEEJl0C4r6U dpmLCwMY= X-Gm-Gg: ATEYQzwEuRNByi447zEQVnt1ckCr8b/sxH16kz3MR/lNpmBSmyDx5UkEjBPj+R6LTHI H/Iis2pISE2D/jv7EyX8B9WhnnuH7mGV3vGbys8+VG1+zrxbf68b+ujFV6qPSnO6f7gzktS2Len /VzXRWfq6uRlgMs8MWM52YikdSakeXc9uavm3yDYsT/zTVm/JpNku6PWurVzgblzPsmii8rmxF7 +egAe9+xAxuIvENI53MIATvSEDBKzxldra+eXQdAdMr1dQGWTNoAT1fWVsSgZdh1OZa/gol6z0x mOUVJrXF2ZSsiZKtlYuILAnrldnv2giOwbM+f/Omffqu8/eByDagdCLh5zCUiDWXj4QNGStLJr7 sU3NwJxrjotvDO9H7KIBOGAidTOTH1eWbpE/hxO+xLPl9SpSm1fs1nTVkL1u2N3AHG/nKs/ZVjV 0nve9HqzxG7c+JKzYXr3ItvT4alAxdHtdvrFsQeTgpwHIfk6m6EW4BGhuuXl5BrED7mm204X9LP PO2biToPsOr3AfB X-Received: by 2002:adf:ffc9:0:b0:439:df0b:2885 with SMTP id ffacd0b85a97d-439df0b28e1mr7445746f8f.58.1773009472790; Sun, 08 Mar 2026 15:37:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 29/49] hw/net/xilinx_axienet: Prevent writes to PHY Identification registers Date: Sun, 8 Mar 2026 23:34:13 +0100 Message-ID: <20260308223433.25503-30-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1773009505387158500 From: Jim MacArthur There are other registers in the PHY model which should be partially or entirely read-only, but this solves the immediate issue. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3297 Signed-off-by: Jim MacArthur Reviewed-by: Edgar E. Iglesias Message-ID: <20260305-xilinx-phy-protection-v1-1-ffc9edd84e58@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/xilinx_axienet.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index d85f8bb23fe..970732b162b 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -141,6 +141,10 @@ tdk_write(struct PHY *phy, unsigned int req, unsigned = int data) regnum =3D req & 0x1f; DPHY(qemu_log("%s reg[%d] =3D %x\n", __func__, regnum, data)); switch (regnum) { + case 2: + case 3: + /* Writes to PHY Identification registers are disallowed */ + break; default: phy->regs[regnum] =3D data; break; --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009505; cv=none; d=zohomail.com; s=zohoarc; b=Nsfn0LS2tRey4ZBxxDvZ76dhjVw3xws7Pp5H7M53a2CBHInVXsF25wiZk05apj70S3r+LZjAw1WquTg5IU+SlrtuqgCtkTNHeIyWohpJwzA533n9nKXdl3Donnd+rWI7HmpOQEQn2QCEmE5WrQBuEwEhgtlmo2N1aFDqc+Et5k0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009505; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=V+hagX+lMg1RLLXCOXLv/+2gyVSWe5aZrKHu4oJOc9M=; b=Q7zRTDzNkibgAUa/FoMKUiLTPdvp8jgL0nKYzEOu8zlyrueViDFpW6sDdv+WLTEfdtP7++tlzvjTp8SMJlJoWfMwkrpeoqc+Id8nfgvBkaC8PX/n/PCUXJlkTUc0Ip5SxhBbe+vLMWZAqObxrSKrq7ZkgCSQE8g5QN7JxSA22Js= 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 1773009505378419.5674428063552; Sun, 8 Mar 2026 15:38:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMlS-0000Va-EJ; Sun, 08 Mar 2026 18:38:22 -0400 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 1vzMlB-0000FP-5f for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:05 -0400 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 1vzMl8-0003aF-JI for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:03 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4853e1ce427so66955e9.3 for ; Sun, 08 Mar 2026 15:38:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48529a2fa39sm55062995e9.8.2026.03.08.15.37.58 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:37:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009480; x=1773614280; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=V+hagX+lMg1RLLXCOXLv/+2gyVSWe5aZrKHu4oJOc9M=; b=JpsoP0Ll5LlrNZb3mqE/PXMqlnjSbVQOVB20TGT3KN4u2oHHkaC438s3vxXQDnqv3d jvg4A7iCWXQaM6l05mLksTEg9kzU+kKwnmNDMPupn4mzYXXBQsLIw3XofarW56Idgl6I mgbmtp0dXaihdHgVYkUogz0bTW4BBho48E22J4ZW8Kjsx0QaT25/rOrJOvtts/M+VBOn l6hN/RN/5j5Xi8tjQ1vCOP4vm1O+yFW51mYhtz1ROCqgtsmVDvgiSbaD9jiWsOzKNFpt rqG6BnPSpv+4hPLO7vSjKcgtvrRr0ofLbvibWPl0ikZeET5bP8Yp8OEHiYvd+Go740A7 xKAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009480; x=1773614280; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=V+hagX+lMg1RLLXCOXLv/+2gyVSWe5aZrKHu4oJOc9M=; b=oB0iFmy17uWlZfRPv4zLqSsUZvn7Q+IZslGZGJvNp0oYSe9692+k+XCpdzuUdpzFuL KIf5Gr0Y1NjbeZbuVvTxuN+jYy8zcaIRjKMm1Jl6EDKf5pS8OcRxiqhupGUwchWWlmCq 5P2ChenceliaUeF4TZ3+btQVEa6qiPBIGWuxfuy9M8rhMPE+eBcJJUEicnQfkc1jotfw zC9C+ReKyrIcqxI0hCRawOxEOG15K7qeQY4IZ9h12mPyInY/5ljEeQEMg2szyq6xHyjj iAZuhOw2EEnW2RWM28YmB/MnEg0W7C9v6L9RP7TNNxG7pJSsild7GZg38N6F3+qOqe9y /FkQ== X-Gm-Message-State: AOJu0Yy9bktlJL6AW3/Yu8ZNUdSVThdv6Z8f0NIwyi42S7r5jdn8V4Fk FTFvRAuCj8xd09WGL24e1urGUfPrB/IPHxxOFKWo3oESamM/eOJWDBhLKa+ShHpnnHXEMCDrHw7 GIA9+ibg= X-Gm-Gg: ATEYQzzz6dIG9P5sn/1Lfqjhw/PZwYtRVK8z/YJk8E+zX009ONJkAsXVN4TGv3Qq+yR 0BTob90TEAGU53L1kPp83f4uKXBEJ5NMJs8XW38WA+VCp1wV2V5KPKawrqC1wKnBVgWG/QOOrdu f5ZeLl5vz1EkfdJy8qboyt1btbDNheSS8lQqQRJ8CU+qMGTHk570A96TJnCDI5vAGlUnoS/razk ISxunEIzLJgBL79wkJmfVy7Bf9pYOMh46zH8+8JZK44UfBs3ytBHPwOV0P5UeONJc6pxhACMdDT ONpZCn2k3G7rA74pWJo/P1WW9sdNJ8QYUIMYvfu3U4y+WdVd+4D7zX2yrhmQV/e0Vnuk8rN255W ocCTDpsgu+47TSRADfFVq9Zv2cpkrJGbe2eZR/mYBv4j0QGMSWfemmgib2MZ0L/pnJvWYCNz7Zd mESKdg6edHxie3hqfeEly4I3sw5R8UknZgjsO9f4yY/H1gVXtwLGFBPUq2IS5zWLaWLPptVmczn b+Yig== X-Received: by 2002:a05:600d:16:b0:485:3c14:885b with SMTP id 5b1f17b1804b1-4853c148d07mr10771385e9.28.1773009480227; Sun, 08 Mar 2026 15:38:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 30/49] MAINTAINERS: Update the maintainer for the CHRP NVRAM section Date: Sun, 8 Mar 2026 23:34:14 +0100 Message-ID: <20260308223433.25503-31-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009507617154100 From: Thomas Huth I am not involved in the ppc machines anymore (the pseries machine was the reason why I took over maintainership of the CHRP NVRAM code in the past), so it does not make much sense that I'm still listed here as the maintainer. The CHRP NVRAM code is used by the mac99 / g3beige ppc machines and some Sparc machines, too, where Mark is the maintainer, so I asked him whether he would be interested in being listed as the maintainer here, and fortunately, he agreed! Thanks, Mark! Signed-off-by: Thomas Huth Acked-by: Mark Cave-Ayland Message-ID: <20260305192223.6214-1-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 5ad5918d7aa..47e2782468f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2742,7 +2742,7 @@ F: tests/qtest/hexloader-test.c F: tests/data/hex-loader/test.hex =20 CHRP NVRAM -M: Thomas Huth +M: Mark Cave-Ayland S: Maintained F: hw/nvram/chrp_nvram.c F: include/hw/nvram/chrp_nvram.h --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009513; cv=none; d=zohomail.com; s=zohoarc; b=RmSQZ0E4vZr4f/iwh+h6inc9vOJa6yGXqZbYJbYjlggew93qqEvYVdHqkQjPA990dPKgRzPtZEBaYwZJ7yE7Y0Ax4L6m1ipSJYbIRKjDU+IScWOSsnDLGelNgTthWOmy2BY5LRH8zCOz4ip+RKGlgI+wcmUf2qjFwMOolFOtDII= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009513; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=47kyoNz4TXjQKO3OpO42aT92D29Nt88tammbySClZk0=; b=ldYZXdEkmu0QHsQNDumd/N7n7sJ+5w1TtoUgEvgThTkfBNz8b5mvb23cicBgHuyPD2Bwg0LubpNcdBeMjhS0uk5qzlfKbuA2MWeDUIcnUStLoEC3fTXeQoJ6XBuy15kPO9rMYBXQGVIR0rC8RRjsM3hx0suNkKWCLoeoIYBrs+Q= 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 1773009513459559.7341673590074; Sun, 8 Mar 2026 15:38:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMlY-00010t-Hy; Sun, 08 Mar 2026 18:38:28 -0400 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 1vzMlI-0000VQ-Td for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:18 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMlG-0003au-PV for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:12 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4806f3fc50bso120497655e9.0 for ; Sun, 08 Mar 2026 15:38:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852378e700sm123544225e9.0.2026.03.08.15.38.06 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009488; x=1773614288; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=47kyoNz4TXjQKO3OpO42aT92D29Nt88tammbySClZk0=; b=Q2+zlqu/Wwqfpio0BFEaMqncQ/49Vw84/PmutmbM1tJDlkgsOKEAJV/I5iTRDipryW EghL8TPwnJoWX7UIQakk+hcGibaU5TehmQaq9j75l6sVOBDPrKMBqAS2QS9Y5rIzJPsQ NKni6rc1xUVga7tajUBNXGLfChb5v2qA58VadBITvoWsNitVkcqWdZLF6pBF1pFkbgoQ SK8+P7UNZAB3b25piVWFyllHKqsdeFEqBRamRdM29bAHme5akNM+NRdba0UvX9efxNr6 5KcUtYUBQorzsNdcXTQK2j2U+Db7D5Qag8p+aAdn0hZkzK+1hmmb+ezY5g9kzxdiGlRI gyLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009488; x=1773614288; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=47kyoNz4TXjQKO3OpO42aT92D29Nt88tammbySClZk0=; b=KB7MmTC5SJIeP8H+XzO/4i8JGcIEEes3V3/g2JhkbxJrd0C9+FdDZCUGyoplDQ1nWw JuGuAgpgb2TgLNuogNc6X8PCA7LyLq7hSZf3IwudrXIFUqqO4F9U81il4uGoUu9VLT/R lXYlr53KX+9Z3kdR6/rb7yACHrLudnNT0360PmgEe0jJINmKV5vOgqp8sV0PKMMob9Fk 3OmvsSdh+XfP87R9X+27dWsmGUvMgICszBwQrwpCMd+Or7LOp+meOoeQhtewwKNRHLK7 8gBj46ddLTOXOWF8W4+nnEGV2AKKWVALCTWW171FJkQOazltAXZmYMux7fiUlxQZYdva Hb+g== X-Gm-Message-State: AOJu0YwAXYgz/kpdCimQCoLxiL6cksfduJzH/OXwsK69mJlIgMqyP81K 6nL3Wy5fJyhbhQy98cL6aVRjtIZPQ9UBhPVmCt3iZlv/PQd/YopQWG3MK5j60FJjkHwM8DqDBJb fPqxzOYI= X-Gm-Gg: ATEYQzxFOcgQejazBYThElEJLR54NRXg1gdUSCKO1Jd4nUNat9LrXmLnxGs9McLRWd0 A/0wEYPEnwOT1f2XlS7o6d8tROhZbZHgmiSFtsoPXjz0/DfAGGDC/aPUeFuD3aTYF+X/IdJ0mko GTvYiV13SzdwjQ7txtk9N18cBnLnz2RsYI9ebZsG46WkohIVX62CC8bThMHjnC3h/+c68AqMcab 6ni9NI14kNUIV6GY3f/2dPqCngppqyCPjK8V4Mx67QsTKWuvSv7g3XpJpRhQr8P2bRZWa3GEeIH vCkwn7x+DtBwR0Db7hUHy2io8kETe46tx3Q3N4egRmcvxuUnYY87KXLGqDQh2bwVWaH96e8/vwG IEjgm0Tm60mNTQKW7gDsbZvvN1GiySOU6ikLpE+kGRE/66sesZkHdod3Rm/K1AgQ06rMpbA9/yS QoPDIk6BmaEMS/9WWen0OiX/+dzAowX7oLcGFoiStcJ3cUPhKE6ig0aUH/P62VcANOxmOvbYGim f38xYjgVDsNi+4k X-Received: by 2002:a05:600c:4fc2:b0:477:b734:8c53 with SMTP id 5b1f17b1804b1-4852692b621mr155025385e9.12.1773009487759; Sun, 08 Mar 2026 15:38:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 31/49] hw/arm/Kconfig: Fix serial selection for NPCM8XX Date: Sun, 8 Mar 2026 23:34:15 +0100 Message-ID: <20260308223433.25503-32-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009515721154100 From: Bernhard Beschow CONFIG_SERIAL selects the internal TYPE_SERIAL device which is akin to an "IP block" that needs to be integrated with glue logic. In case of NPCM8XX this glue logic is TYPE_SERIAL_MM which the code uses already. Fix Kconfig to select CONFIG_SERIAL_MM which matches TYPE_SERIAL_MM. Fixes: ae0c4d1a1290 ("hw/arm: Add NPCM8XX SoC") Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Message-ID: <20260305220911.131508-2-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 03aa2a03db8..4e50fb1111f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -482,7 +482,7 @@ config NPCM8XX select SMBUS select PL310 # cache controller select NPCM7XX - select SERIAL + select SERIAL_MM select SSI select UNIMP =20 --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009526; cv=none; d=zohomail.com; s=zohoarc; b=edWCLvJq48lG5q/TWYJKiv8eZruMRRno+xMF5Jsl7kBisdDy6aiheR+Q5JxUUuoYjmJyeBPFN/6x4IlxJbZc8EkSW9TTEmOwhgNlUwukdVuIiY5ukayw4SEPB95X9edL6gMuDgRJAgDtNmIhzCd1vuW0hgLkO0lDyYFkm/gI8Dg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009526; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=GvUVBcZDjzFhxJC1/LgqFuCi6urkQ6s14SjPt7T3TEs=; b=WwD7ndJMJhrNOeizijqtYL1L9rXeUE9KVOrqd68KgFxLy5t1Xmpal/CxnUaF8p9qaFwPnFZpTyYENbREah8ObiAMYf3o3iSjNArmP+03sWCQAvNg20O0Hsyq6UBXExc7AdHrtKuCQkSbzSOcTiPWuBmUv2Dq1ctODs9qpHAHc6A= 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 1773009526112979.9791744925991; Sun, 8 Mar 2026 15:38:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMlf-0001Iy-KF; Sun, 08 Mar 2026 18:38:35 -0400 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 1vzMlO-0000ZJ-2L for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:20 -0400 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 1vzMlM-0003bd-IL for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:17 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48534e9076fso4359345e9.0 for ; Sun, 08 Mar 2026 15:38:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853a498afbsm30116055e9.0.2026.03.08.15.38.13 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009494; x=1773614294; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GvUVBcZDjzFhxJC1/LgqFuCi6urkQ6s14SjPt7T3TEs=; b=R60U7aD8MD0ujRJAHECOeRRZK/GxpCipxoqNLU/VhQ8nGIe/h0gcBPQmkM2e51pWpL d5jd3kiFJu5g9ieOimQoXq57lf783aCzkcGl1FFzn7Xl8Sj/3hupcYhKabDFIOAztsDD GnaF65g5fPzVftiYqGyg+nPnkOq8MuD0akoZqT39nU1K7y0Jd1Q+doIs7W3TSTGkNyO4 XgwMSrYhcTz+wXafqQ0jo5s4j6eYT5Wh2dcdMu69z5iDtb0bze3mwsAAC+1psQfh1LHB 9THxAIZ4+1LZ6K+kTXBQfDiSpkEwu+bEGEas7mDQW11sktEW/2fdCz+Y2z+HmkOz2VM0 +Eug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009494; x=1773614294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=GvUVBcZDjzFhxJC1/LgqFuCi6urkQ6s14SjPt7T3TEs=; b=BQylHMMZSSt8M/jwUJpl+hKcUNWdSO1mWwQbMQvItXuPebp4K5lY6JQMqvjdZw2THM sTMBVZbArvimplJ4uCDtIGCMFGxv2/eBrKODVCCQ1Y0iO7Eri0g/7Y/ujLDm2C/CKnwA oqSwuiunrelCKi1evikJtyC9zK13qxq7vGi8rXPHnwfJkAgfL5yu/o0JZfrkknfTCds2 8CEdso/e4Z/HAdt6Fh1iU1ZOtIIN7dwStta35r+CIiZngYQVuqJ/it3mK5EEzzRD9d23 wtQ6LDVHOe8K6X/AP/40T9j+3YqNpdAr2GiHTG1p1gQfksmydoxL8HWGNFF92IsijTEH PMvw== X-Gm-Message-State: AOJu0YzErYkVWXlpiaz2Wi3kXMPucgc48Tb1B9LkporheZsYfwWfpEPm K9XE/LoOSVqKRnkISSHFY8qE2AdVSx3rxUCyaxhwvOQzF25ZEiapz19n9aKiUeM78BCnXxkSGpE 5mveQNbk= X-Gm-Gg: ATEYQzyU8vQDduCz0uxALPh5iegB/BjtudKgEii56caWTs8ywo71oFrLCbOcdN4lPhQ 3uyDC+JMAW8X+i7jP5knkGZI5SCXVwe7w6+ilW+NSNIsiDJGemPaoPe5mHGSKzUQZzSDLvQwtTn 4UEQ4hMrTPiVHTHQJtXDtXiKbvNxK/e3k73CHOsbxZK2JB3cfHN9YUE+Qp0T3dtdW21/wAulmtN bHm3pGkKW3cUik02xUDUqfhXfmdSGORGamkeiN3rcX6Tf6+AzDyCxi9GtlFb5BDGY53LkfNefoM aXWdzMBemjtCKq3NXaJXX0XZg5E8h3z0LGlQSHxDwlWDpjvQfCapN0r2IkK8VwLUcTZPeDtBLD2 dgccvJcPChH/hzLvHUPgk15ILXBT9RUIJy5+DRMjEKLz1HC2XKF4I24CISqkRsxGY1gYbZJQlZA 860upShWkCPgDCIa8RPWSLXnRZiS5mZTtrBGOZrllSWUmHeolwdDXvxDPQn5Sn39/FHXrPw9CTj GlMvQ== X-Received: by 2002:a05:600c:c16d:b0:480:39ad:3b7c with SMTP id 5b1f17b1804b1-485269582fbmr173229825e9.16.1773009494212; Sun, 08 Mar 2026 15:38:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 32/49] hw/char/{diva-gsp, serial-pci-multi}: Fix deinitialization order Date: Sun, 8 Mar 2026 23:34:16 +0100 Message-ID: <20260308223433.25503-33-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009527528158500 From: Bernhard Beschow The memory region is owned by the device being unrealized, so must be removed from the mapping before unrealizing. Fixes: d66bbea4e0d3 ("serial: add 2x + 4x pci variant") Fixes: 274074708455 ("hw/char: Add emulation of Diva GSP PCI management boa= rds") Reported-by: Peter Maydell Signed-off-by: Bernhard Beschow Message-ID: <20260305220911.131508-3-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/diva-gsp.c | 2 +- hw/char/serial-pci-multi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c index 280d0413c6e..f9aa6e326d6 100644 --- a/hw/char/diva-gsp.c +++ b/hw/char/diva-gsp.c @@ -62,8 +62,8 @@ static void diva_pci_exit(PCIDevice *dev) =20 for (i =3D 0; i < pci->ports; i++) { s =3D pci->state + i; - qdev_unrealize(DEVICE(s)); memory_region_del_subregion(&pci->membar, &s->io); + qdev_unrealize(DEVICE(s)); g_free(pci->name[i]); } qemu_free_irqs(pci->irqs, pci->ports); diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 17796b93dd7..7782452018d 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -56,8 +56,8 @@ static void multi_serial_pci_exit(PCIDevice *dev) =20 for (i =3D 0; i < pci->ports; i++) { s =3D pci->state + i; - qdev_unrealize(DEVICE(s)); memory_region_del_subregion(&pci->iobar, &s->io); + qdev_unrealize(DEVICE(s)); g_free(pci->name[i]); } } --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009530; cv=none; d=zohomail.com; s=zohoarc; b=foYIRV+L7rKvzis8fN+gdqcV6yDm9vKfJNj+ZrpVU4VCfr3G/hdFXbs+7X8ekDF5VLB9CfmtBOieJQgsZf171/jsAtV24E9K03/VFtUT1q9P6B7FvVHgkgRHGVbrKThds0CFh8K6oc+uxykMEt0G7oZLEMMuKfZy+vm3KOL8V+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009530; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XEPh2xTN7YPEj7nIs4tW6xzkgeZmWy42bG++Vd7IoLs=; b=Yc9QIxChGzcKAaSw3zamZUDDbvTPZuZSLXDITnBDWYekeFBT+6ZpVB8F7tVEdU15HmqiAB0Z/JnX6vT8YezHW5Mv/oXcYcaaMdh2SXgbF+rhfs6pqkihSDjOfn/ASwv/nHJcHfND3cLe+zZw+5WDENe+xCdwbNWPtYb89+2hOH8= 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 1773009530380972.4158875796139; Sun, 8 Mar 2026 15:38:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMlm-0001qm-E6; Sun, 08 Mar 2026 18:38:43 -0400 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 1vzMlW-0000zF-CP for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:28 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMlS-0003ce-Eh for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:24 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-439c4a93841so3617255f8f.1 for ; Sun, 08 Mar 2026 15:38:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae57401sm17679188f8f.38.2026.03.08.15.38.19 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009501; x=1773614301; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XEPh2xTN7YPEj7nIs4tW6xzkgeZmWy42bG++Vd7IoLs=; b=sJS4gWjURQh9tEVLLcJR5lY5w224xRQrEn0+8tWL3kEEYI6utxdUf08dY5MHxh9/Vv cmt0QnRUjE0d0ayfuipKO7gMt7hUneu2fNKujxjmQRJ7YqY6o5+QRfvhxa+ajWz/O2o+ 5twUE0tdYsiywFj2kQn1HfoWARih4ZCSsyR3EpNvmNi3e78TtnYP8K59s+10WHGKQlQ8 KZrAPQzKR1P6KI1tlWSI965OJ8JK30Zhha9M7TuVFK/+xvOCcyzVSlOV1a3xVUfKIYGq xRfuJ3L45BXokEsW79n90fGZHI5t/0ROJyTDtjENSSpT5I04zGvJgAmbldIvTVEOSf0X W+mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009501; x=1773614301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XEPh2xTN7YPEj7nIs4tW6xzkgeZmWy42bG++Vd7IoLs=; b=SpsYGGE9D7voHlhrtvSS0Bbs9Egm0+Kdpg+imEBefrelvPXZt64Szxr40vAW6EqAQD 1mPFFCaIsXexaxc5mvwGSW8rnnBBwFDgh3wvefHpnGxYjlm1lRhSaQ+y/VlgMRRPMnkG Q/LZMGw5Z5pCYMW9Gk8nug73unRiE1jLhc7r6/Qn3ek8Fvuw09uuAgzqVN2lMYEi3coj hky/7z7zSNY095wFSwHJmXu0blNWk6PNICkwLur5sy+Q6LE2x8YTgrZsOKMD2ubVaLg0 NAKnyM4cTM6sjqqzE16KPVR5fy9B08PQp7c6n4BBb9zSy4J/tMvX4RGAGBHvYnsRIAIL Ir1Q== X-Gm-Message-State: AOJu0YwdmdNP4vdh9kkuA/k+Q5uQVV015g8CTGPmNkhdLO7043d/b1BG ikC55krpEyiKRRNoIttDRHaGEkG//n9lJt6Vu1hCLPtGRRULvg5/IvkJikNu0NqhEuK8nD/ONkC brYDbg1I= X-Gm-Gg: ATEYQzzc5NdybYDaJhVMKmSZNFOEVzEf3dD/i3dOVHRYh+8IN9zIPaYH+QuyuYzSvai 49SUyHjDfjXo6tz61VMHTvP/QWMdXlLrlPihcWt0FTIXQkLK3G5Oh7E3zxZMXBHHr6aG0gaCICn nNAF/AVKV3L6hEsjmA9pV3CmgVVqMkPjflLbtxEbdyP1ajcmxHQpw/XW/Ije8pKd3qonmK2dHPs fdbzYruGwwYMxrVXCNA3jIeMCFHRZEuzT4GbB+jHuoPccCLWs+QGb00E2pKeCBZnQw+kjGhCfGn BwJgmGnzC3wTziopZP20uphOWLMNS4r/Zxuexgc7wJKi7UjuExp8gAeWv6OIQJQj5Q7MaBUnfKW /Teq7XQTwmkRT00tQ2lZZ4GVHlrNuy9DVDg0HTRr/doI533r+zwH5IUVCSf4r/TEsnrQLdD/CvY s6IQk+EDMPnhK1LsIIDg+fqX9i4WLczEnEvMjIJeU6uCSZJFxZlnpohEK2EHFroPh39xNlHBcpj sTC1A== X-Received: by 2002:a05:6000:310b:b0:439:bc2b:cb50 with SMTP id ffacd0b85a97d-439da348173mr17325899f8f.4.1773009500709; Sun, 08 Mar 2026 15:38:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 33/49] hw/arm/aspeed_ast27x0-{ssp, tsp}: Do not access SerialMM internals directly Date: Sun, 8 Mar 2026 23:34:17 +0100 Message-ID: <20260308223433.25503-34-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1773009531953154100 From: Bernhard Beschow SerialMM inherits from SysBusDevice and exposes the memory region by means of sysbus_mmio_get_region(). Use that in order to avoid accessing implementation details of SerialMM. Reviewed-by: Jamin Lin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Bernhard Beschow Message-ID: <20260305220911.131508-4-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed_ast27x0-ssp.c | 7 ++++--- hw/arm/aspeed_ast27x0-tsp.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/arm/aspeed_ast27x0-ssp.c b/hw/arm/aspeed_ast27x0-ssp.c index 9b12ba67430..8b84300e0f6 100644 --- a/hw/arm/aspeed_ast27x0-ssp.c +++ b/hw/arm/aspeed_ast27x0-ssp.c @@ -149,6 +149,7 @@ static void aspeed_soc_ast27x0ssp_realize(DeviceState *= dev_soc, Error **errp) AspeedCoprocessorState *s =3D ASPEED_COPROCESSOR(dev_soc); AspeedCoprocessorClass *sc =3D ASPEED_COPROCESSOR_GET_CLASS(s); DeviceState *armv7m; + MemoryRegion *mr; g_autofree char *sdram_name =3D NULL; int i; =20 @@ -230,9 +231,9 @@ static void aspeed_soc_ast27x0ssp_realize(DeviceState *= dev_soc, Error **errp) } =20 /* UART */ - memory_region_init_alias(&s->uart_alias, OBJECT(s), "uart.alias", - &s->uart->serial.io, 0, - memory_region_size(&s->uart->serial.io)); + mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(s->uart), 0); + memory_region_init_alias(&s->uart_alias, OBJECT(s), "uart.alias", mr, = 0, + memory_region_size(mr)); memory_region_add_subregion(s->memory, sc->memmap[s->uart_dev], &s->uart_alias); /* diff --git a/hw/arm/aspeed_ast27x0-tsp.c b/hw/arm/aspeed_ast27x0-tsp.c index e39d1dc1712..e7c7b744919 100644 --- a/hw/arm/aspeed_ast27x0-tsp.c +++ b/hw/arm/aspeed_ast27x0-tsp.c @@ -149,6 +149,7 @@ static void aspeed_soc_ast27x0tsp_realize(DeviceState *= dev_soc, Error **errp) AspeedCoprocessorState *s =3D ASPEED_COPROCESSOR(dev_soc); AspeedCoprocessorClass *sc =3D ASPEED_COPROCESSOR_GET_CLASS(s); DeviceState *armv7m; + MemoryRegion *mr; g_autofree char *sdram_name =3D NULL; int i; =20 @@ -230,9 +231,9 @@ static void aspeed_soc_ast27x0tsp_realize(DeviceState *= dev_soc, Error **errp) } =20 /* UART */ - memory_region_init_alias(&s->uart_alias, OBJECT(s), "uart.alias", - &s->uart->serial.io, 0, - memory_region_size(&s->uart->serial.io)); + mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(s->uart), 0); + memory_region_init_alias(&s->uart_alias, OBJECT(s), "uart.alias", mr, = 0, + memory_region_size(mr)); memory_region_add_subregion(s->memory, sc->memmap[s->uart_dev], &s->uart_alias); /* --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009527; cv=none; d=zohomail.com; s=zohoarc; b=Uqi74qFnjvp2H7s6PCafnDNzi8qUp7mhLLgHYlcSijtEkQdI2lNi1kiJ9iZkEfB9Sjwh5PWPI+RzaSDC9tlqdHb5mxmUjl3zRaW7Ej6HUr3QnLJ8oaid+9BT0BfZmMByqHcqf1tvo0ARtbkZLX5WI5BwF63gAkasaJ5nv8pzAZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009527; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=3zOV3qUmRo9bOigA0eOBWw/VAz+Y8n3y3THv+nRsqxQ=; b=GuYnk9vvTVGTbc7aszUcaHAkIdI9wdWotsji13wZaJeIRQ5B2cEfY+/D7vWvqSlRnpGoYznecPfrnXUTFqyFg2xDxCqh3LzFX06yfRbc6sNXx7QtqR8pJ1Kylsm8iRpXDfEhCmwnhau86C/IBYWCDsrQu+gNlOr1C0aueV+V6LE= 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 1773009527414398.99412647807526; Sun, 8 Mar 2026 15:38:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMlj-0001pW-R8; Sun, 08 Mar 2026 18:38:41 -0400 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 1vzMla-0001In-V3 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:33 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMlZ-0003dE-FO for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:30 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so17234975e9.1 for ; Sun, 08 Mar 2026 15:38:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852378de92sm109056735e9.0.2026.03.08.15.38.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009507; x=1773614307; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3zOV3qUmRo9bOigA0eOBWw/VAz+Y8n3y3THv+nRsqxQ=; b=RZnPagHF6P5KM5C6KKw4qPWZwG3ms3j5jATaBVQiRXfpJggT1MlohSUKRLSy3x6pnb 3pYf1yN9nfnmSuxTlKiFZKVkwyvDLHp8H/yCGNy021DK1rwyUkEZsm0Eo00UJAKLy45w 3T+efyKuxi9ZGIdw32+zk1lAmz0CODLl3nZuWYy60auHWSU6HzOhHsfPHclvy7dooYvL /kYe/QX4Nsr9bWZwgupqS1mcsMDGftxXG4pv/pG1aqVdHUUMnt5LZ4fu2ycf2gLlpShv fpDvLsBtLs2g7whemR0IOzG96xM2L+iJOF3TE9kxyJ9WZQDWrpj6C8Gzs7obDqKEiEIY ammA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009507; x=1773614307; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3zOV3qUmRo9bOigA0eOBWw/VAz+Y8n3y3THv+nRsqxQ=; b=qSwpEyKjMWAUrTdPezgpySfJW7RN43MuASGJv1anfXz8To3XUyta6yAwds7Z20qYQb 9JqkHCQp+r/bl5MHn/ohUKyXgNTj8pZ9AfmX6JEz129g+wkEStRvCfbPT6+lFWSXXCiI FR8FW5b3gtgdflrC8IhMaeA/yhi2xi6vNoZGY/JzJKSuSZtJWFbAZToMoS5hrcYulyA0 SoDXxw1MKa4d5L6AsuHf/P7RIzzjJOYFMbwxk3Jz6HTfVyXnp7y2+JxMgFGEsIP7dTRE XJb/dQ+zwMFmkURlaDSe2BP0IpDBcOZ42gy6u5b2KLy+tcPZjPa/ipXcX8FHeK+go2pk EhbQ== X-Gm-Message-State: AOJu0YygJ+edToHeeKmxFWKNnVC2W6LZpJ8J6y1NFYNHmMXXrN00aNoB UXifdQ0f5uI9jyoxJrcyxFL3FkUcb27OGUpG9Uan16Wbh9AWax7f+Q/8PGkIGEWoY1ovh45oGlI KXz+U760= X-Gm-Gg: ATEYQzz3kSToSdN1prTrlvlSuENMINcQTpKjBiAHPz/Bzl34JY+zWr+xchUnh5a02fO 8QWOVogUvJx45ZlK2I2EucLlKd9ZGs6FKwVrujtu3gPTgOPaTgEqlhdarnRi1XjxYDvpdcJcf/W z1fwA+lqQjFO3ZO0qpisize06meJmq9VjueLmK5wfz0knLObE3fOw0rjwiv1c0BeGl4cKGQlaNo yhk6Uv8vIo1kyHYU6lAuwqfgzMmmpIRHUrOCpotmPJHgZcdmBSy80pVpqiio6w0/Rgk3oOLBt5d 2v0KivAcQTEH/UL4FBLriRsNsKNr6UnWp7QyktDjDtwF8FonM5cWhbKRH5KITmL5JaugkMwEtRV 6Y4l0DFhYOpTGjPn3ZCAiiEhLcxZHzCapO64rZrVcT3DKuCCZDiCKqtvG+jp1iPGLglZ9eZM8xV SEaoAiQokwczwMeXOcQVKUr0huPnS0prH2ySF0MixKqISPzSEkQFcIA1vk9/fxmemvi3KPo3Oyg ROhMA== X-Received: by 2002:a05:600c:46c3:b0:483:47ae:7c00 with SMTP id 5b1f17b1804b1-4852695aeaemr165621675e9.20.1773009507180; Sun, 08 Mar 2026 15:38:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 34/49] util/fifo8: Make all read-only methods const-correct Date: Sun, 8 Mar 2026 23:34:18 +0100 Message-ID: <20260308223433.25503-35-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009529962154100 From: Bernhard Beschow Allows these methods to be used in const contexts, i.e. where the parent of the fifo itself is const. This is in particular useful for Rust code. Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260305220911.131508-5-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/fifo8.h | 10 +++++----- util/fifo8.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/qemu/fifo8.h b/include/qemu/fifo8.h index 4f768d4ee38..6b476b404ee 100644 --- a/include/qemu/fifo8.h +++ b/include/qemu/fifo8.h @@ -71,7 +71,7 @@ uint8_t fifo8_pop(Fifo8 *fifo); * * Returns: The peeked data byte. */ -uint8_t fifo8_peek(Fifo8 *fifo); +uint8_t fifo8_peek(const Fifo8 *fifo); =20 /** * fifo8_pop_buf: @@ -181,7 +181,7 @@ void fifo8_reset(Fifo8 *fifo); * * Returns: True if the fifo is empty, false otherwise. */ -bool fifo8_is_empty(Fifo8 *fifo); +bool fifo8_is_empty(const Fifo8 *fifo); =20 /** * fifo8_is_full: @@ -191,7 +191,7 @@ bool fifo8_is_empty(Fifo8 *fifo); * * Returns: True if the fifo is full, false otherwise. */ -bool fifo8_is_full(Fifo8 *fifo); +bool fifo8_is_full(const Fifo8 *fifo); =20 /** * fifo8_num_free: @@ -201,7 +201,7 @@ bool fifo8_is_full(Fifo8 *fifo); * * Returns: Number of free bytes. */ -uint32_t fifo8_num_free(Fifo8 *fifo); +uint32_t fifo8_num_free(const Fifo8 *fifo); =20 /** * fifo8_num_used: @@ -211,7 +211,7 @@ uint32_t fifo8_num_free(Fifo8 *fifo); * * Returns: Number of used bytes. */ -uint32_t fifo8_num_used(Fifo8 *fifo); +uint32_t fifo8_num_used(const Fifo8 *fifo); =20 extern const VMStateDescription vmstate_fifo8; =20 diff --git a/util/fifo8.c b/util/fifo8.c index a26da66ad2c..cc4f590b7af 100644 --- a/util/fifo8.c +++ b/util/fifo8.c @@ -71,7 +71,7 @@ uint8_t fifo8_pop(Fifo8 *fifo) return ret; } =20 -uint8_t fifo8_peek(Fifo8 *fifo) +uint8_t fifo8_peek(const Fifo8 *fifo) { assert(fifo->num > 0); return fifo->data[fifo->head]; @@ -157,22 +157,22 @@ void fifo8_drop(Fifo8 *fifo, uint32_t len) assert(len =3D=3D 0); } =20 -bool fifo8_is_empty(Fifo8 *fifo) +bool fifo8_is_empty(const Fifo8 *fifo) { return (fifo->num =3D=3D 0); } =20 -bool fifo8_is_full(Fifo8 *fifo) +bool fifo8_is_full(const Fifo8 *fifo) { return (fifo->num =3D=3D fifo->capacity); } =20 -uint32_t fifo8_num_free(Fifo8 *fifo) +uint32_t fifo8_num_free(const Fifo8 *fifo) { return fifo->capacity - fifo->num; } =20 -uint32_t fifo8_num_used(Fifo8 *fifo) +uint32_t fifo8_num_used(const Fifo8 *fifo) { return fifo->num; } --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009537; cv=none; d=zohomail.com; s=zohoarc; b=UZsNcpce5Q6Mo4IGlQ0XklBbPXTRFRXhVv6IMhk3/5bxnAHnTWEgVMCrhQasux8FJxmxkJwFmqpfnyGSnqSIb275wVx22M+2cXCHilKEftq6VwM1w8euAtrWWCIxhB7DbfUq+eObUmQzMruY1uDzJPZpv5QQxEBDZTJG3tfNJPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009537; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=c0hbwBE0hnQGstdyI1VIsE+1GxU4ynbA0Wq9xhPHvFk=; b=CqeFIxbK42YkMJYuOuCYk8z6XhfRS/avG1ZmtA2i17cPdV3/AgjXnDhzbtEE7HttlEDGap3y60IIb3s9DyXptWn3Hkarf/gfmslHIsGqADBqSr1FcXOTukPMowqgkpMuogUupWHYE7II3Gv2WabUMvB3Y05mSr06Ur3WOmwAmdc= 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 1773009537379250.2188040857411; Sun, 8 Mar 2026 15:38:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMls-0002Dc-3N; Sun, 08 Mar 2026 18:38:48 -0400 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 1vzMlh-0001ii-Af for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:37 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMlf-0003e0-Mc for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:37 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-439b8a3f2bcso5556420f8f.3 for ; Sun, 08 Mar 2026 15:38:35 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2b9d8sm22744808f8f.21.2026.03.08.15.38.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009514; x=1773614314; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=c0hbwBE0hnQGstdyI1VIsE+1GxU4ynbA0Wq9xhPHvFk=; b=KwwvXer2rR/xtAG4D1AujNQnvu8WwiS5Ho2dwYv4RsIOPbSxH1EvVe6K5PJf1MiPM+ dl1LmH8Tu7o9EM/mYh5xtGJvwxMDpUsifIWCwycQu7M3ajEtK0jg2rC98dFhXQmFBL2T 2pUBOy3paPI0CtBOzJTXFU6FIJGKjx0SHfkf28GDeDjR1i7zTRNUAbR4uzBYqyYl50HW dHsmmnhSzOPVJnVU/KZ6pfPZ3HNvwKGcpNF/051xM5m3oxPydpTrJ/TF4cHyIO3/d7c3 qEQTwzkF/i8IpY0QceVPgJay+VCrkKImsPrbchcq40kX0X9Ci7Sk3Npx4JqGe/2Ts94F Reyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009514; x=1773614314; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=c0hbwBE0hnQGstdyI1VIsE+1GxU4ynbA0Wq9xhPHvFk=; b=c5BMaZLaLVirbhV6sjDDQVJS6vshf89N+YQIHwuINxGSgfg6NdUZ1roMQeK7AXxWX4 97d0mFbX/1ZrjnC2RmxrbOvWgGta/m5p0OZPx2Gs/NAiJL88ZCklRTD6N3X0kfvAeGyS 1RWt4aeUcN/XgPjfz8gNdKosQz0txfcSvS409WMaxb9ZPzlQxOKsC94VBXVJ4j16Pc32 18rJxLexkCmaWPkeTCNFEqQQ8qGEpMOI0QvfxjJspiq3DiiS5I0rBGR4GiFnWz8b7zWX xa8wwQej27XpxrPfGxpdbgUOWw6N64ZD4h8+s7IYV2ey45OUXtKJkUh7zsKr2h5nw/Tq iPvg== X-Gm-Message-State: AOJu0YyvZenpzKNsmrYN/dw1uD2a0p5lKt3oSX+XoaN0p/Bw5qupgmZF 10PAO57G+maBFHI2W1uaUHmm/ODHw0sTVivTgT3/K4gmnxcqhMeFko5y+/N8NjttYxYin3iU/nD voDQfClE= X-Gm-Gg: ATEYQzwFwv1PG9lzVqzYZxPwd2ykZfHIXJ4jebXHvFdlmLlg7o4Mqg6U/NaKyx4DGP2 +T0Rwvmc1hdL3T4une6pJxtzpAsac6JzjXrMnFiOQa4/oVYwnCuPz7bzOlhwspuHwDeEq8Ramrj BHNlA09PPe20vCzKgh3oDRWZPlUfbzV0tVUSTj486QqdmNZuTjb2jNa/DP3Ns2fc50+WO3ZTARX cs0FiOh0SqctJwIuGaH1qR3GLLu8/W8OaTu8pa6azg1YgIxZtqeM/QORe2pOqRP+8lWKcHLG/K9 c8xD3IUROH+WDvxpWaUyLj48b07R/ubAyBl2ieyjHI11HP1yywYP6KbT1gR4P5V7zFk5da9ZfAJ UxqiUu8IP6mHeL+cIwge+CzAuA0DeeFomRGAl8nhwOyHPBCqtTH5FXWp1oL3s4k7yah8nx4iasr UtybO3WWMTd63ItT9B/oJr/JsFpJytHkqyFFIZxpGasGrQfZ55/YKO94vSCCCD2obk5GpQEHwMW wJg8Q== X-Received: by 2002:a05:6000:250e:b0:439:ad72:9900 with SMTP id ffacd0b85a97d-439da885f79mr16119738f8f.29.1773009513797; Sun, 08 Mar 2026 15:38:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 35/49] hw/char/serial: Remove explicit cast from void pointer Date: Sun, 8 Mar 2026 23:34:19 +0100 Message-ID: <20260308223433.25503-36-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009540058154100 From: Bernhard Beschow A void pointer asks for being casted, so C allows for omitting the explicit cast. Take advantage of that. Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260305220911.131508-6-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index adbd1d1d4ab..0f2e79dfba6 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -715,7 +715,7 @@ static const VMStateDescription vmstate_serial_thr_ipen= ding =3D { =20 static bool serial_tsr_needed(void *opaque) { - SerialState *s =3D (SerialState *)opaque; + SerialState *s =3D opaque; return s->tsr_retry !=3D 0; } =20 @@ -734,7 +734,7 @@ static const VMStateDescription vmstate_serial_tsr =3D { =20 static bool serial_recv_fifo_needed(void *opaque) { - SerialState *s =3D (SerialState *)opaque; + SerialState *s =3D opaque; return !fifo8_is_empty(&s->recv_fifo); =20 } @@ -752,7 +752,7 @@ static const VMStateDescription vmstate_serial_recv_fif= o =3D { =20 static bool serial_xmit_fifo_needed(void *opaque) { - SerialState *s =3D (SerialState *)opaque; + SerialState *s =3D opaque; return !fifo8_is_empty(&s->xmit_fifo); } =20 @@ -769,7 +769,7 @@ static const VMStateDescription vmstate_serial_xmit_fif= o =3D { =20 static bool serial_fifo_timeout_timer_needed(void *opaque) { - SerialState *s =3D (SerialState *)opaque; + SerialState *s =3D opaque; return timer_pending(s->fifo_timeout_timer); } =20 @@ -786,7 +786,7 @@ static const VMStateDescription vmstate_serial_fifo_tim= eout_timer =3D { =20 static bool serial_timeout_ipending_needed(void *opaque) { - SerialState *s =3D (SerialState *)opaque; + SerialState *s =3D opaque; return s->timeout_ipending !=3D 0; } =20 @@ -803,7 +803,7 @@ static const VMStateDescription vmstate_serial_timeout_= ipending =3D { =20 static bool serial_poll_needed(void *opaque) { - SerialState *s =3D (SerialState *)opaque; + SerialState *s =3D opaque; return s->poll_msl >=3D 0; } =20 --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009530; cv=none; d=zohomail.com; s=zohoarc; b=JBPTdt1utqKGqgUXMojbJfvGCm9TWijMA7KHdwoNXC6bhhXU2ZYHUD1EZYyk5IX7TCMNh9IGUiUUKHwskvbbazqnXjj7LHvq4eD4oQHw7rv2IlPQ1grGdEPHuHYJ5K+ujRp2xju+6/ft0ozh2Eos4+EEGIiTc+ZbAvOdEcQhkXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009530; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=6qexEWqj7iCTD7/+Rc0f8L0qzeY//jV37wBu4R3LB4M=; b=X+m7p015Ri/BlsHfyk2XGAyOZJyKilfiTHy/VA1FyfdwYS0GIQwBPEqEWGtrjsqLd+TrTOyKJuEHsA6YitQctoi4kNydVn6Zol5X2poIUiqXlf3D1lCkAcgRu0hpD+o5Y5+VT+QaNlXTO3/tWrTdfaoU9TdS4HU0/V7dST+CLWI= 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 1773009530668142.54978337554587; Sun, 8 Mar 2026 15:38:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMls-0002GX-C6; Sun, 08 Mar 2026 18:38:48 -0400 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 1vzMlo-00025i-Vt for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:46 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMln-0003f8-Gy for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:44 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so17236555e9.1 for ; Sun, 08 Mar 2026 15:38:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48527681e3fsm200375215e9.6.2026.03.08.15.38.39 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009521; x=1773614321; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6qexEWqj7iCTD7/+Rc0f8L0qzeY//jV37wBu4R3LB4M=; b=SLkXTOOhvbej8yz5Srv0SbmuquI4iG5zSgUB889Zr5zXY7n9ztClSs4LgxN8Du8974 Y1Fnmk8Q30VvtxCAyas6dGKUXLpDIAZ1OVT2KV8J7Q3Ezbl8CvD/YHc9KTM5Zjn5sA1s X/SqSY1VQ6fvslunH51/DX3tE2o/7EfLrumtDEdhCR1LYn9JRFIzGcN8ttNH3ImWA1nT PbJr7sfr+BFrk3h0Xbm94v153+6Sn7rJwE+mWjKAzMAEsA5S7cQms0D7/sCpORNyTLn+ +dfbRLGYw0W0Omi6filii3k2rJee49k8VDEZTjkxpniJsFnDNNkdTyCQfdR9+Xt5i03a O+Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009521; x=1773614321; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6qexEWqj7iCTD7/+Rc0f8L0qzeY//jV37wBu4R3LB4M=; b=Nxxh0kl20I3TqZYaPki4KdGSb0UyjJBVMIrWlOq2jhuipvTqQtfwY36gMZOIuFSJdX oDf01et92sBLx3tqgzWl6ExyTn/tp+jslcBM1psc3IWpN+PeURv0LPU3FAlR8tlkWnw+ wXjRjVW3TPg3urP7g3qZw8Bfc4YDxAopFCXyeRPkUXbmt5Y7QXdVErXyQGGmuwC/Xy+1 mVFN2QEz+J0NTLRtc21XeVBp+LBW6Ne9HWxRlgZeT2p9zTN6Qrr9O2vkQKnf18bx5HZC iDsA4WNn7Mm/HFY8wFmpADzbhcWEkQstjlmZWzz1keCbhhvW0SZ0xjbh/z14F4y7qIHW 9pYg== X-Gm-Message-State: AOJu0YxNaVVwxVQ5GrrcbPFvWl6rq1QDhPxxxoSxyMbK3pS2wn2jQJ6h nNFTEQwGXq+pnkW6klXgVhocAh7rEtUNQZypw8n41z5lJ/YpmtJ8GQ1MZPtViZJSn1jGMtQbazB nEYJUnCk= X-Gm-Gg: ATEYQzyYp2rotDloKypKopNlb0ASBTFvx2Dv0JhjfMhSFOu/5Labas63y4WQn8c/Se3 Vz8Y+jSLqE8yIbnpIqmbdtC11PdUeBBRWXpK/Tum+ytPPDq/b18xF6BQrL/CDib/2xUmLpaEFLk A/wdXs9Dx1bBp1hJfnwdkrbY+w83onCD8zok2q4oyr7w9iKZMejgs0v/1F+vJQ2XcIj5cMqKTB2 iYTVeAkvjUKNdWCs6imk7+50OH6vYfUnnQ5PQGNFobGAO7nUubzmUSO/JrLpPANmxK5TosQCVVH ejm2jFX7I+GvPzaJ3VC81tVLmTRcF/fL1uY2T4ReN9qgMY9ixTHqYGw5S4Bwf+RPNFoe2mwGqRT eP7riagBmr0Sshdz2/AZZr1aZ7Evuw82kJqZCx8EKaL7um5H6K46DTNvdg5vntkzXrslew2/6oP fu0ayPHVPSmrPqJmg3FdLGuTyyd6rW8YcvEzNDAX+SKAX+Tbg7RJB4J5Dz8Bxq6hScfG5w0lCGj s/lv0sxwi6UXoIf X-Received: by 2002:a05:600c:3e87:b0:485:3e00:9440 with SMTP id 5b1f17b1804b1-4853e0094acmr927015e9.24.1773009520999; Sun, 08 Mar 2026 15:38:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 36/49] hw/char/serial: Prefer fifo8 methods over open-coding Date: Sun, 8 Mar 2026 23:34:20 +0100 Message-ID: <20260308223433.25503-37-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1773009531960154100 From: Bernhard Beschow Use fifo8_is_empty() and fifo8_is_full() to improve readability of the code. Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260305220911.131508-7-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 0f2e79dfba6..20f68fd2f83 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -239,7 +239,7 @@ static void serial_xmit(SerialState *s) if (s->fcr & UART_FCR_FE) { assert(!fifo8_is_empty(&s->xmit_fifo)); s->tsr =3D fifo8_pop(&s->xmit_fifo); - if (!s->xmit_fifo.num) { + if (fifo8_is_empty(&s->xmit_fifo)) { s->lsr |=3D UART_LSR_THRE; } } else { @@ -481,7 +481,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) if(s->fcr & UART_FCR_FE) { ret =3D fifo8_is_empty(&s->recv_fifo) ? 0 : fifo8_pop(&s->recv_fifo); - if (s->recv_fifo.num =3D=3D 0) { + if (fifo8_is_empty(&s->recv_fifo)) { s->lsr &=3D ~(UART_LSR_DR | UART_LSR_BI); } else { timer_mod(s->fifo_timeout_timer, qemu_clock_get_ns(QEM= U_CLOCK_VIRTUAL) + s->char_transmit_time * 4); @@ -555,7 +555,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) static int serial_can_receive(SerialState *s) { if(s->fcr & UART_FCR_FE) { - if (s->recv_fifo.num < UART_FIFO_LENGTH) { + if (!fifo8_is_full(&s->recv_fifo)) { /* * Advertise (fifo.itl - fifo.count) bytes when count < ITL, a= nd 1 * if above. If UART_FIFO_LENGTH - fifo.count is advertised the @@ -585,7 +585,7 @@ static void serial_receive_break(SerialState *s) /* There's data in recv_fifo and s->rbr has not been read for 4 char trans= mit times */ static void fifo_timeout_int (void *opaque) { SerialState *s =3D opaque; - if (s->recv_fifo.num) { + if (!fifo8_is_empty(&s->recv_fifo)) { s->timeout_ipending =3D 1; serial_update_irq(s); } --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009535; cv=none; d=zohomail.com; s=zohoarc; b=TyhGV1ny13/QoTncanXKl9kn0Qst+4sLV69F6bXc85wEeuAelIr3SCymOO4Cv2nbdGjuObAHi2wHDfGx86z16mbw1QORsF88hTPfrWeH8XIMdFBwNfcQ8URX1eIKbATyfkuvzZKEaY0iHni+8mfpyFLzYKuD5Yu4lYrcXfgOoo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009535; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=6C8YP53jTJUFe5XlsI4+jeif+amgbN6vtqB11RHrjI4=; b=lhkmd6cVaRpatotty6eGkN9GZOcuJZ/cW3/mScw1Le8ossAQm5cZvEMN4vrV8lrEQuRZfoUJgwO6v2panq2IoYx/lZMtKDMzYEpUv9CLMvcYbdpTJbjDFEUqlzM5+r4Muob9FyzTDClEKNBFjNeMpdZnwP5K+Yt2TGAnkSf7/pU= 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 177300953570140.25487655170389; Sun, 8 Mar 2026 15:38:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMlx-00036q-3o; Sun, 08 Mar 2026 18:38:53 -0400 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 1vzMlu-0002g8-VH for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:50 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMlt-0003fq-Bb for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:50 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4852afd42ceso18739835e9.2 for ; Sun, 08 Mar 2026 15:38:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48527686bcesm339163205e9.7.2026.03.08.15.38.46 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009528; x=1773614328; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6C8YP53jTJUFe5XlsI4+jeif+amgbN6vtqB11RHrjI4=; b=pAwq5DG+XbgTLiG8qj+OBav2y2oUp2DxU81avMspomzk7QZ7oy9udB6cpY/avgzDkT /jZ9WD1LFbt5CihScFsbTFotIvdr30Lg9QXcJYpCB3zwBv/ytThC/ShFh2pOGaaGbWYV QanR4IeG8gPB+rFEljrfTMIPGKw3tp6syi+9fEV+B51Hbr3ZZhbRKh4G+OSsAWM9kLrZ clMY0cZE3opFtaeWwMQg6eCAxGA5lqkqaTKKD2/MGEj4p8EdKjRKwj5cOBR6wI7ZVJgD Ve0mFUuWLvH8/iT6SgwX0rx2s6oNHR/ZPH/gr8EllhsuLEGuLEKrkOXMge40y1wcPXco 3FQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009528; x=1773614328; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6C8YP53jTJUFe5XlsI4+jeif+amgbN6vtqB11RHrjI4=; b=ZZDq9HglO4Zud7nz1NISVcWGtCCJ0O7XqRYYHBCLnmUN/09lo+GYsXQiAEkkbt7wMO wtC1PlPnemRVB+bGPnhZnUeJtkAL2Dcw7U2GDvZp/XEH9g7AImyhaYPaWFAyKp0M630S jjDFZfifGyGRp56H2wZRv0n6E2aV858K3kWoYqmR2fDEN1z9WEBO+Xs/RVGpoaIleySc gRAtHzTn4vg7BFiqjUQwnV4TgeVSd5FIMUXwYKLq8M9h1CDTlNUqqYsIIcx9ZvRiILUR TSSCXOuFRuMl1IuT8r7C9XLEtIt/tIwGC/DY0+6dBDzjh/bJ7Qxo9A+e/cIRDsm9YCIW kIrg== X-Gm-Message-State: AOJu0YzIGkTqx/lLBzfsKKk7J07pesa11BqR3XfQs2bwi7MJJMY+8Hrf v/N+4Y/C6hqAmeuBWu2yJLXsTPkiyMF0o+xxTqoSZEUm0g7v57QtMsZr3j1RnX06JcbiiD7SYz4 PDKznXlA= X-Gm-Gg: ATEYQzy5YvqgYigwo8/cNzut+PbCFxfpGyDqFdQgGTFmPDW2ZP0Zzgl2fI28vuqiHFp pG/urHaZIJAE0tLRPEz/r2mwBlRCD6DWFfhiKfCwxzcbw4aY3ucotuyXCExc8t/lzB6rUdhYsYR /4h8vg0hAucn6IOm+3tzcg6nt990Zr7F0W73WaK4tPNZIRLRVPqLQ/LjINDeftRUbkmIFLDnA0g f5Csy9CA1qJ72CPzFpK9NDQpO5QFmBGZMlI0RwMhcAwnSWXTxwfr8Dg8hyBp2c+e75EUTf2hbCQ lo6xvy0pw4hDeCuR1rk939cwmlpxkuqs8llrzUSriFKOBSTtAXXvOuH/MOl0lcYoE5HbuGDH/jR LtJZe0YGxt9cAeZBvQtsGWK/3JG6ZnSz+91UHesXV2HQh7ag2prlB7TlUYkap7WJr46Nwgj3FV1 9EWKThIweWPDLF4ftIMgI3Yai2vpZ6R4HHCUnfwda+AZWghUAD1SiYEuikCzmTgZ8J8OE+SOEHF Sqe1Q== X-Received: by 2002:a05:600c:1e88:b0:482:eec4:76d with SMTP id 5b1f17b1804b1-48526959464mr147091035e9.17.1773009527552; Sun, 08 Mar 2026 15:38:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 37/49] hw/char/serial: Reuse fifo8_num_used() Date: Sun, 8 Mar 2026 23:34:21 +0100 Message-ID: <20260308223433.25503-38-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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: 1773009537527158500 From: Bernhard Beschow Avoids accessing private fields of struct Fifo8. Now, TYPE_SERIAL only accesses struct Fifo8 through its methods. Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260305220911.131508-8-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 20f68fd2f83..2c558cb9fc6 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -128,7 +128,7 @@ static void serial_update_irq(SerialState *s) tmp_iir =3D UART_IIR_CTI; } else if ((s->ier & UART_IER_RDI) && (s->lsr & UART_LSR_DR) && (!(s->fcr & UART_FCR_FE) || - s->recv_fifo.num >=3D s->recv_fifo_itl)) { + fifo8_num_used(&s->recv_fifo) >=3D s->recv_fifo_itl)) { tmp_iir =3D UART_IIR_RDI; } else if ((s->ier & UART_IER_THRI) && s->thr_ipending) { tmp_iir =3D UART_IIR_THRI; @@ -563,8 +563,8 @@ static int serial_can_receive(SerialState *s) * the guest has a chance to respond, effectively overriding t= he ITL * that the guest has set. */ - return (s->recv_fifo.num <=3D s->recv_fifo_itl) ? - s->recv_fifo_itl - s->recv_fifo.num : 1; + return (fifo8_num_used(&s->recv_fifo) <=3D s->recv_fifo_itl) ? + s->recv_fifo_itl - fifo8_num_used(&s->recv_fifo) := 1; } else { return 0; } --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009543; cv=none; d=zohomail.com; s=zohoarc; b=P2BJUY0IY0ZDjsF6dQjAA5rlqZBGXldAmKey07HfoGLsapEFyp7LDErU+AnM2/+AP9JINyotfysZAqRVHFe4ASiFuGPRfR3ZeGRUITbS8F1E6fiVFVFr8cET+U1D7KtkzUk6YqvEwicdzwjsHcjB/sEcsQTILKtdiiC1/dW6KXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009543; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=JR52r9ZtO9W2DgERQA3WBebgIB8kxNudBv3P2ybJoFI=; b=Z265cPF5dgt0tvB+rzg8NPvWqD4u4zmsrkqVHT2iPwyvLnFKqZFaQxiMakBiKMsbj6suRT3bULxZ435LN9/PViApN+u05wONuGIgSKqsvh9LdQe4E2n+7KMkQgnhrWor1XvZT68GvHKicIP6MrnpFwchjqxVzX2MlnuV+g1d/nQ= 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 1773009543628990.3529962676192; Sun, 8 Mar 2026 15:39:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMm3-0004Rz-N6; Sun, 08 Mar 2026 18:38:59 -0400 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 1vzMm1-0004BT-PQ for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:57 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMm0-0003gI-81 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:38:57 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4853e1ce427so70655e9.3 for ; Sun, 08 Mar 2026 15:38:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2b9ccsm20591505f8f.19.2026.03.08.15.38.53 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:38:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009534; x=1773614334; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JR52r9ZtO9W2DgERQA3WBebgIB8kxNudBv3P2ybJoFI=; b=tTePaCLr+f3gsQrvkj0uDO9NS1YEVUSPP3g6+Q5FCjLl2TtE1aTugRABG7pAdmOyKs 2WaL46gUh4QYKD+5gi3UX8U2cJeMFwq59iVJeWD4ifXh4OvEP8Pl247X7WkQkAZSwyxu DalriNKTzt77Z+uvNrbJp+dXa3ZzK+7doY17eWVMJOFsx+/RiKJzwvwq4plEqTvFw/GE 0+JzRJ5VkiNHhTQ3yE2BJoHBOsFLwrm0xl4BK4oVIcQA8+G8eliwj7p1Iw5gtAUHJp6e JPVezSH5nIU7L99/NPP1gRyIHPM8xrOG5HcDDE+DXZarCA4PS2/dN1a8y5Dssu4prlwP u+Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009534; x=1773614334; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=JR52r9ZtO9W2DgERQA3WBebgIB8kxNudBv3P2ybJoFI=; b=qdLuy3diUfhhHDOFWC/aeN4HD0yulDkW0V5QA0KAvnF9/o1E5yvfG45rLK0mQB3OJC DpELPy4H2nM5DddZ5fcStNcrRoN/551DTCesAsefFi81BqEH5WJixHgBXy9S8+JPdTG3 Z+NdZFW8YzWRxZ36FJb9Bn06qpAHgHZgDSwfP7mbQBubyFfLCjuodFW1JGR0U0UX61oX z7GNa8kMtWHWcMfOlN8LNGomipiTDXuFGe73svWtlEAHr88mf3yzPTeHS0wTYap1jxsp 5xKO+zKJKKvrHKkSez4/ITbmOQrh2oaVL3Nlc1hzVPomxvoleBQMa18cTeTwsWWNQTZ7 8iCA== X-Gm-Message-State: AOJu0YxLGSISe2mYUxzTDwQH+HPCO4f91BVC4LbdZe/+g9LC57bV3ivc R1ZHb2Q2hQvihl5KcqNLdfmkHeKDtpX7XavV07ZaLb5cPjxaGrszhPrrx1EJAdew8E6IPuoQ/47 w9SGxpLg= X-Gm-Gg: ATEYQzzgoCT/mbPF0pl9rHD3XhfDSRpsBwDF19F2rvlNMI/UOzBNMJ6Ebz/QhhLpwoK BENAy8CUCwRNgCsELY/7WZf/1T2Wi0Ix7IA/et/pW6PyB5Q8XM6V3Tzst0XEZKRwJAqdormMZAd l+gsPrphtUs0uV3IhCjse0VHK/+Y+n7M5RXFXupkBJKaVxucF1i3Q7Ja3YbHlfa2g1b5R3nfi56 0zXujV4FBbS5w+LpcsjcsfoK4fVOm+hX4E09HSAhReifDLZOVoud1JyAsb7vQ38yCmC4waBQsvZ KL8tq287PXycSbIJuEW63YuNnYl3LS61E/qngXrVrx4CvEQUkIHDRkqlosBkQ3BUw3pr5qoiTvP 98nMtPuo/3SX7OCfm6M7nfwtmFNbVIbXewVAqEd+CPLfvUkAZUJuD2VM4tWnH0ijnkQQxJD1fGF Wu+Wu9Z7pT1LYTw0NfWsaBNWJVyrMGO3SLL5Wqp92ZOJQUVlo/c6mT372nsQskQBAPL1u8iYrCQ Xr20g== X-Received: by 2002:a05:600d:16:b0:485:3c14:885b with SMTP id 5b1f17b1804b1-4853c148d07mr10787375e9.28.1773009534370; Sun, 08 Mar 2026 15:38:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 38/49] hw/char/serial: Remove unhelpful comment Date: Sun, 8 Mar 2026 23:34:22 +0100 Message-ID: <20260308223433.25503-39-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 1773009546144154100 From: Bernhard Beschow There is no "is_load" flag and one can tell from the method name what the method does. Remove this unhelpful comment. Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Message-ID: <20260305220911.131508-9-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 2c558cb9fc6..f73de1ae4f6 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -281,9 +281,6 @@ static void serial_xmit(SerialState *s) s->lsr |=3D UART_LSR_TEMT; } =20 -/* Setter for FCR. - is_load flag means, that value is set while loading VM state - and interrupt should not be invoked */ static void serial_write_fcr(SerialState *s, uint8_t val) { /* Set fcr - val only has the bits that are supposed to "stick" */ --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009556; cv=none; d=zohomail.com; s=zohoarc; b=i8JMUzEeA7Az4GghYaTdJwLAke/48DEZhFWsaMtDA29uVZ+SMqDLYNvsKJgVjzZ25gdR4otl9fCqB9jqRPhwAlJQ/lSfMV3DbN2okeyAq1iE5rJPextQQ0zm34O09uzlMx9WbSno7/EYjopu0fLPVZn5HacJbPlusKmrGg5KHME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009556; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=eD9KrrMRpUnsRRcfrIHopUracPsWULIHud3yN+PZeC4=; b=nRf7OFiFXzR/FsBxpFj/vukB6nUtakHnGjolLCkNHKBiFkc7a+kBZ645N3+QlRT0IznrV80Af3GQEByqIWgBruNEgtuuy3HcjgWA9dPBEtaOz6hSNLRhz7PGm8TTkV8me7L5r6TR9QqZnAp3o7qdKtWUznT2dEYLyrcBm3HfkbQ= 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 1773009556128127.93954533713327; Sun, 8 Mar 2026 15:39:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMmF-0005ng-CG; Sun, 08 Mar 2026 18:39:11 -0400 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 1vzMmA-0005WX-F9 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:06 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMm7-0003hh-Sz for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:06 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so17238165e9.1 for ; Sun, 08 Mar 2026 15:39:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48523803b5fsm73706055e9.7.2026.03.08.15.39.00 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009542; x=1773614342; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=eD9KrrMRpUnsRRcfrIHopUracPsWULIHud3yN+PZeC4=; b=y677n0mENZluNG1iVMmQtpbxPRfORJ4Vi912iycLJMoy9HuYVei7yzAwA/n1TxvrrA r9C7KgABklElTQrh8Zrsvpw6y1H8QGJs7mL+iWPiVxpQsNGFPxq7ApQ/SOzSLrn34+ij E4rqXkbt9Sd0U/aaZAzeQLnkUz/cdheMrhMg37Lxz0rMhGZrGZR8mIQTmh+UiZKH5GkB 8XXM41FX+7yfsES1rLReb7buwJtcmdD5PQabI+lcfJNL4iWxbP+vcKW9fuk9vhmwCrq/ 6tKY/KVExeibtoRZ893zOQliehLA0J+V7ri7cns4lButNm5utjMr2ivlMqIdQiRrcwyr ObrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009542; x=1773614342; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=eD9KrrMRpUnsRRcfrIHopUracPsWULIHud3yN+PZeC4=; b=lBAfq/7zth6oiRYQzuzxbx6V28wuyGDsVPeux/FBsluG2fRtyftsf+e/FNCtU/8SbY llGWNPOAoV/MIS5j0NexcJmiVCg4EZYqNBbh+zkok4tefW1Uis1uvhrlgR5FYtKzuNho +atnpz8hUMUrux/YXVY/X/Dq884mQh3J3gHeQH6r3z0Eg73dXxdeqVIcjaOiG2YFgPXc 76wpCLPMprQTs5vh5pJEFX4vVc7A0OPHc13wv3pjuu5kRIRXPyFVYoXi7vbRaDzdDAzr KRpmbfSER+S8pFEcojx+rQ39PMaUItZJLu0qB1RI0CGmKHhVIKnJYOmOwnYRFVAkB5uU /ztA== X-Gm-Message-State: AOJu0YxzKxLnSSIlp1T33GrwuKk0GO7reUOH5BmFz3WlMfvS3vumnyIw m7/kyFYAwrlxOlNKAu+qjT6ZceI6OmBUPMScnJ9iAddrQ++ZCl/oWWjSwTMvJaIMn8+ht1itX6B fze6ZQgY= X-Gm-Gg: ATEYQzwNPQuBYlInAptkcoh5HfYD+S54lDewlXxJ5VxfHLGZENxk+18IaPfCrj5ArGM SOnrlABzH+WhgyfPLQ9BqjkbrUCJfnK14/c7iC9PHTrfmJAgHEOMdWamYtMsuBsXvYr+lR7HBRh riO+3I0Nc2sJ/hHmrzkLW6ndDg5vmp+agIXrxjTqvCWI4nkLOdaUBtUu0dPqpXKX/xSwPkLf8jH ChHKg0dSg9tIwqrFo7YmyLPxq/WpXNYaWUc534ZcGNaRaAzbOP3B4ytHE60is4nkZFSfr+CL6Zk GjSO23M6nGFckglNEaoYaXdto4KdS6yrklr46QDufspFbTrkuBQbgeWwLjl6rPLsZAMipARfRRi mJxx2VDKZoDkiqARuFT11PUEvItrYfq3qSXKO3m+BBQTTZ5YCtOlvcsGvJyL/84hPGR1eLZ9qt/ DeX7UpbqzABnzU5OkxYR15vyfqGSAARqzdNXJEVSzky7m3PFAgIcZCBl/wtq81hXBr7Lh+5tDMq MRZzQ== X-Received: by 2002:a05:600c:4591:b0:483:c3f3:1dad with SMTP id 5b1f17b1804b1-485269791e2mr154074335e9.34.1773009541932; Sun, 08 Mar 2026 15:39:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 39/49] hw/char/serial: Add constants for Line Control Register Date: Sun, 8 Mar 2026 23:34:23 +0100 Message-ID: <20260308223433.25503-40-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1773009557623158500 From: Bernhard Beschow Substitute some magic numbers by named constants for slightly improved readability. Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Message-ID: <20260305220911.131508-10-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index f73de1ae4f6..485b98f03ff 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -39,6 +39,11 @@ #include "hw/core/qdev-properties-system.h" =20 #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ +#define UART_LCR_SB 0x40 /* Set break */ +#define UART_LCR_EPS 0x10 /* Even parity select */ +#define UART_LCR_PEN 0x08 /* Parity enable */ +#define UART_LCR_NSTB 0x04 /* Number of stop bits */ +#define UART_LCR_WLS 0x03 /* Word length select */ =20 #define UART_IER_MSI 0x08 /* Enable Modem status interrupt */ #define UART_IER_RLSI 0x04 /* Enable receiver line status interrupt */ @@ -153,23 +158,23 @@ static void serial_update_parameters(SerialState *s) =20 /* Start bit. */ frame_size =3D 1; - if (s->lcr & 0x08) { + if (s->lcr & UART_LCR_PEN) { /* Parity bit. */ frame_size++; - if (s->lcr & 0x10) + if (s->lcr & UART_LCR_EPS) parity =3D 'E'; else parity =3D 'O'; } else { parity =3D 'N'; } - if (s->lcr & 0x04) { + if (s->lcr & UART_LCR_NSTB) { stop_bits =3D 2; } else { stop_bits =3D 1; } =20 - data_bits =3D (s->lcr & 0x03) + 5; + data_bits =3D (s->lcr & UART_LCR_WLS) + 5; frame_size +=3D data_bits + stop_bits; /* Zero divisor should give about 3500 baud */ speed =3D (s->divider =3D=3D 0) ? 3500 : (float) s->baudbase / s->divi= der; @@ -430,7 +435,7 @@ static void serial_ioport_write(void *opaque, hwaddr ad= dr, uint64_t val, int break_enable; s->lcr =3D val; serial_update_parameters(s); - break_enable =3D (val >> 6) & 1; + break_enable =3D !!(val & UART_LCR_SB); if (break_enable !=3D s->last_break_enable) { s->last_break_enable =3D break_enable; qemu_chr_fe_ioctl(&s->chr, CHR_IOCTL_SERIAL_SET_BREAK, @@ -676,7 +681,7 @@ static int serial_post_load(void *opaque, int version_i= d) } } =20 - s->last_break_enable =3D (s->lcr >> 6) & 1; + s->last_break_enable =3D !!(s->lcr & UART_LCR_SB); /* Initialize fcr via setter to perform essential side-effects */ serial_write_fcr(s, s->fcr_vmstate); serial_update_parameters(s); --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009576; cv=none; d=zohomail.com; s=zohoarc; b=AMCbdmB5DOmCXe71vypc1u6FXjpD+8YL3dCPD1cG+Qz/pkspzXnGKcVF685WW24cJkDZJtu6kacPqchDqau59pTB9k3vf6e/HztTDInBJqBpD7uiB62r3ZTp8X69jl5bnZN1asGSaUm8MzTM82FDqFy9Hlz94PHc3zRvSCMHq3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009576; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=v7GyfBp3Wi3fm2ZsMpcG7W6DRqITpDr3CQqKgZBHl2M=; b=XGA7HumlvDH2EAP0NWDe6BsDnxIuV8hVSs3G9YLGv5r6qCVSaRF88w7/ZMfH4KgQOCN/w/vzKt3Rjlv4s9hTbFu3rnoWvvzoksvvwYz8ZwNQxoYeR7e6mPCKvSkT2VasapUaoQxpJT7IzncMiXC90W5zv5zbJ/2rYTJ6Uv1dqLc= 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 1773009576156678.8354876119065; Sun, 8 Mar 2026 15:39:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMmR-0006H6-9p; Sun, 08 Mar 2026 18:39:23 -0400 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 1vzMmH-00062l-RZ for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:14 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMmE-0003j8-Ig for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:12 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so17238655e9.1 for ; Sun, 08 Mar 2026 15:39:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852e38c013sm282928305e9.8.2026.03.08.15.39.07 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009548; x=1773614348; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=v7GyfBp3Wi3fm2ZsMpcG7W6DRqITpDr3CQqKgZBHl2M=; b=OudZd6VkGyUKZ0b0G8Vb4nKjnWgc9Ux8LGtcZQ46vKxDRjK3VxO73feRf2J/jcPlsT dbLdR9KpuZP3QvthaJzOg4zii+thgj2Mu0lMd7fZEmkQftPmLy9oeRNZQ22SaZ6Noyal /WVnwciu+DyrKQ6s3ZI7BzQ/5t5Vir2teBpZ5bAXDspmFtpyvP715/TeDeF4ra/KUjMF zkoFBT2dqgJ+C4gvkk0NlXouK0TsS4uPLMep3C0f1ffQMoeJNGk0md9yldXnBCA3tS08 oYJ+TJD0uJ5TDNK8ldx4G2VS3FQrYEcKsBuimlQEqyvbIWwQK1JYezFRvx8xojDArWKk n0Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009548; x=1773614348; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=v7GyfBp3Wi3fm2ZsMpcG7W6DRqITpDr3CQqKgZBHl2M=; b=q0FA96vq3V2Wwdkmdsu7hVHppnEzyFW45AjU7v3ulT4ej4QIfe1oSL1rAJ194MGlP/ eBIwoI4AwkWhyJmezlBKDRfhSAI6bpjZJJCwgOSRgJ/MVGUp+cl5YcOr/sFkopbGSnzJ g9+RDJTXx56PbzOuNrCX61a7d/VylEOEMyon5vs+NhqXebV3yx6Uc9POl6hw/S2N6nm+ 9h9QS8ilcd3iYKWiKwPOlWS6YMvwMYgJl1e/i34JwXa3S2Og13QEIgvzY2pxraHXhoGr 19OBrLolsUeC0mX5mfcN8ZB253lrjfeR9ydCWee/0n9X5wjZQa7nUZRtS7Lageq2CVNa t3bQ== X-Gm-Message-State: AOJu0YymnI+tyv7Ota35vUzZecgi2LQTjKYzcNxj6YkQgBn5CS6OCCPD cnunuqQYDWu7uHgZCmL0dqcGSpPU0aKzLwN3xWMOCTCBDfOmBi4i0Tj7HbTK9a2Pe10HgSb3s0E KvdQ3Xwo= X-Gm-Gg: ATEYQzxL27SN4yP8PPq2g5huHkKSvgun9wzDz8JFshNX7HuUHIPtUj98QJ+Wx3mdgZx hVXbkeKXXof7UtHRj0k2MC6j1RwvPawY2EHlgTPEN6bgy/5efSFoNHH4kL4PYtRI0p8hSsFmB1f +hHgdPcrWBog5WZHy+btbeM/KjXQi1GrTEt+aBpepukuJgUL8ky8p6r+Wwz/QqNy2tHKsLspYRb ZqIREthz9r6sBbEQ0gY7pyQyFT1Z9lCjnE2/hfEkNk5hmnl3PBVFxwkL1GOplXLxB9vW5nR0mBE KL3SXp/dhVRzAU7NCdUJZm+3EU8TPzLXSMGGBSER243sBb9G8W0/VnPOuKBSXP01JQYBYtgszk/ eLtLDtCgkIhTk8Xq4tRdKutcWUxSjXrtw0PcnyZzyDRU1KuuWRM3BenwKAzKMkj7RaSuboP9mU9 aMaHfl6tgGO8hi+FUW2a/x7X8YjtWeoWLnxu0p0seHQtedg6JPkD2eqIku2qLDl05zi83CZM/VJ MKPIg== X-Received: by 2002:a05:600c:620c:b0:485:3cf3:1010 with SMTP id 5b1f17b1804b1-4853cf3111bmr4424425e9.2.1773009548503; Sun, 08 Mar 2026 15:39:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 40/49] hw/char/serial: Remove redundant reset Date: Sun, 8 Mar 2026 23:34:24 +0100 Message-ID: <20260308223433.25503-41-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1773009577658158500 From: Bernhard Beschow There is no need to invoke the reset method in realize since the reset framework will do so anyway before the machine starts. Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Message-ID: <20260305220911.131508-11-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 485b98f03ff..0f3469a1e8f 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -934,7 +934,6 @@ static void serial_realize(DeviceState *dev, Error **er= rp) serial_event, serial_be_change, s, NULL, true= ); fifo8_create(&s->recv_fifo, UART_FIFO_LENGTH); fifo8_create(&s->xmit_fifo, UART_FIFO_LENGTH); - serial_reset(s); } =20 static void serial_unrealize(DeviceState *dev) --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009573; cv=none; d=zohomail.com; s=zohoarc; b=Xtos0Umn6Jbs+tzh5hhPgPAbyMfICp1raiTk8qrGNWD8EKt4zRUS7Mzgz701r6MHK/H3ZJDYOF2S6PzrnxnvFwy35aGSNNeVxuR6lduJm5xilH6JscBxbGMrr+zEn9z4bPR/y9YGrhbouj01NCiUGtGGg7DPGSoyYLpwo/D1Pgc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009573; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=CvxEuWUffZVii1EhCg4BQJVn8lfA31fdZwToBj4p//M=; b=AvDTCQVMHhc9rnMK/eeMVhITy8P7GbxiR0iTsD3HZSc36JbMmkrfYW0byUlC07kpdFj4BKYgwLtfu5Zyo/PWublSJaB1+ClMFW8E01UkAHIc28oIYenxQOt3e7O5kyJJzWZPWS+Ob6dUL0bc5N6u3nCTDnWUBONwGXyktDivBJs= 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 1773009573742873.4162336336248; Sun, 8 Mar 2026 15:39:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMmS-0006Uy-Nb; Sun, 08 Mar 2026 18:39:24 -0400 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 1vzMmR-0006Ka-Cq for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:23 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMmL-0003jz-OU for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:20 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4853510b4f3so10361815e9.0 for ; Sun, 08 Mar 2026 15:39:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48527681e3fsm200398305e9.6.2026.03.08.15.39.14 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009556; x=1773614356; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CvxEuWUffZVii1EhCg4BQJVn8lfA31fdZwToBj4p//M=; b=ZkF9o8Ts5QGa3POOYVTDVrakek8/VDZn8zO33hNbOXEihsVcEVnty7dp9g1trTBfRd i7hLKZ4TD5WldAi7Jd9F3M3fmDxGcGoS9rdSUc/fKuIRzgzcH+obzLHyE+2aKIHa0+eF 23aT1WMvB6MkJyedLYGR6csg8HjRtSZnmmtLRW545sPDlDiFWnzDvXrQucthc9EUUNGK FRAzi1w/gKeiU+6VLJdfGCalS4wyAWowEETzHaOmCppuIQZPjYSF+BWNKjKWlNVukCCA fnG2dH/D10l5MNpmzeUQGW8pMJgkZXdPE6RdZ+wZkWb+us/SUeOQg9ItmRwxS3vRUBUE 63og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009556; x=1773614356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=CvxEuWUffZVii1EhCg4BQJVn8lfA31fdZwToBj4p//M=; b=i31BB6GbI9hLb5XOMSmYETxDHrY31OBxxUXbrEq80ABjKc1b1vnyxSBb/481J6xEFY j6PBebN8clz1AmZoF3Cnr3rCdNQ0FhAgx4bw/UFB7jAbNb1fLiUDOV3Dofc09WC6ORjs AkugKPxYLsnTpyuZ4VjKyHwkp0wIYE0247EP3uTKL5jHGLahDhGCEzKy4EwO6K5s+DTd azzKFrcngNc56YpTGpXWz+VCmKaSSZZT5800mtReiX8xqDHCDV8UTI9kMjpSpbCY05EF 4lO75RAIxdHokKW7p0fj4lk5XoU8ww5j/dYjt196VKD8uzeIYaZQLaKzxL/hD3CfnxS2 fYyw== X-Gm-Message-State: AOJu0YyOuKjcE0I9SM1tEx9mQ0RcHvfv7XBYNpxrGSdsObtOuP/4YvPz QkXiYEh2O6uafv9WUIQFgSO/pCKkuHXWrDHEndAp+XX+MK0EHkjKpMVcTGhLGMImNYGGCEEvDGZ QO3BVxpc= X-Gm-Gg: ATEYQzxqXrq6QdAT1t766XInvtool/Sd3Nf8GYsVe8ALXJ3RmIZ/dWLmN9a3LhbeWHz 0FAlVtuKlB5LC8aQJ4coRPAg/ZxAp7HTT9iitpsPnVHMDRw/LVWeIuWlcLelw6jIXQejnWaE3ha tiogpaBwmPAsbfe/n5f45mZ7hL3Nyu/+M2FcrMn4qc6LlBHU+F0C6WAnpjfWaSMc+s+HLt/ae8B HdlrAYPEQUIt9LaO0GzS6vUj4hGK+2RZ+yzpXiU9c6F2qfDFBJli0gzYuezSPSvAmA/y4sgxYFn LDD+u9AHECuw6jU0R6i2GizAJRH1AA9bK39KHoSzBzFtWcN+h6RT3d4jXAgfpz95qtVamFcspRe vwFm/etp8Mq5OQOc/mqVOAHBCaHjOs8iSoTJmLb4gSGAx9kTAbtilIQ7WtwmNZCx3XrYJvS2rkn jatIu2JqUnIxGN1USJv/N2keuXVxIvSe+wwiNnQ1iQHhfsYAoHJT6S6fnz0/97tdnr4eIiMPhRZ NtAOw== X-Received: by 2002:a05:600c:c173:b0:485:3812:36dc with SMTP id 5b1f17b1804b1-485381238b3mr50660405e9.9.1773009555759; Sun, 08 Mar 2026 15:39:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 41/49] hw/char/serial: Avoid implicit conversion when tracing Date: Sun, 8 Mar 2026 23:34:25 +0100 Message-ID: <20260308223433.25503-42-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009574591154100 From: Bernhard Beschow On 64 bit targets, the MemoryRegion API passes an address and a value as uint64_t, so use that for tracing. Keep the uint8_t for reading since this is what the device model produces. On targets with less than 64 bits, uint64_t is wide enough to avoid narrowing. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Bernhard Beschow Message-ID: <20260305220911.131508-12-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/trace-events | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/char/trace-events b/hw/char/trace-events index 9e74be2c14f..a3fcc772877 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -5,8 +5,8 @@ parallel_ioport_read(const char *desc, uint16_t addr, uint8= _t value) "read [%s] parallel_ioport_write(const char *desc, uint16_t addr, uint8_t value) "wri= te [%s] addr 0x%02x val 0x%02x" =20 # serial.c -serial_read(uint16_t addr, uint8_t value) "read addr 0x%02x val 0x%02x" -serial_write(uint16_t addr, uint8_t value) "write addr 0x%02x val 0x%02x" +serial_read(uint64_t addr, uint8_t value) "[0x%02" PRIx64 "] -> 0x%02" PRI= x8 +serial_write(uint64_t addr, uint64_t value) "[0x%02" PRIx64 "] <- 0x%02" P= RIx64 serial_update_parameters(uint64_t baudrate, char parity, int data_bits, in= t stop_bits) "baudrate=3D%"PRIu64" parity=3D'%c' data=3D%d stop=3D%d" =20 # virtio-serial-bus.c --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009586; cv=none; d=zohomail.com; s=zohoarc; b=DDXx81asjj2xfNEos948Y+CoLUjf9ujb4/6AwAGidQ6PpO8I6T1Quuxb98uUZQ6RDp9LGj8Px72QsLkkvNABVXrLz+xtW07HJswICBmPYt7ngoPrWtSyiUPVqcW6OEgBA6n35srZTYrI5ouy/q2yv91jTxxeDGj7bu0xhXwrUEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009586; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=PfjxtWhAJ3CuZYePYTssU/iwsvuWkdbwakKwc8f5rYI=; b=O1q14q+f6tlBv4BrNP9nfEmr3umx4wy9d5m607tukKhlLJ73ziWOc2j7SdXy8L+gGUSt+rox4RcbLfLLQBDYmx67yLGntHpzPZd5ulluDDFOZW6HO6TZhXV7sb125DckIZfybLXTHDE3D6AtLsbafThew9D3qP0FZzLIblN93Iw= 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 1773009586074457.70953663158195; Sun, 8 Mar 2026 15:39:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMmX-0006tQ-0u; Sun, 08 Mar 2026 18:39:29 -0400 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 1vzMmV-0006pv-IF for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:27 -0400 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 1vzMmT-0003kO-4j for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:27 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4852fdb36a8so14720125e9.2 for ; Sun, 08 Mar 2026 15:39:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853c22762esm7155975e9.28.2026.03.08.15.39.21 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009562; x=1773614362; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PfjxtWhAJ3CuZYePYTssU/iwsvuWkdbwakKwc8f5rYI=; b=H71VdGSurUqtJsed/b+q7xEcgU0xKudmuMMDiLGcPycXuRLCB4/QtqkYsE4ssPQV6f w5r7qXKXKz3ybr7w6PmpxNbPsdYugq3pKnkOh7N9pDMQBvMUL4X9AL0joZ1Cardb1uvA +fPhDduEuPFtY9LUeAr/DAhwS4q/4/89bdSSDFZac7bSjic8qIvRN1s1WhqwlRj5WrO+ s3vAX33KBJq3syUdDbq+kyBzMIJ/kUN5k6Hk3dNqdxRCjFpkBrvn9Xlq2zKe7/wTTYat wqRgb8E6JsqiVa56JSX5pvQSIaJHCVG9PR7qBAV2oizRqkgroug+ZsZWqgSKEyGunKhK F3PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009562; x=1773614362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PfjxtWhAJ3CuZYePYTssU/iwsvuWkdbwakKwc8f5rYI=; b=UBYp5LYo5gceoVTLmsciXSu0KGhz0Y1tIp6UP2xDTmWTw5snYE8MA4tTXgyqbPBDvx SmVa42vZy3UDJYBGOLlu1ioUoLj62QXb5TPZB7z1pZak6tMRz1WjAK39iBaa9rQrIyVf P21STOmeI0W50qvVrau8oW1zhAqGAy3dpECItfpbtnZnwgcduC02yHvbqXvUMMoaclXW w1pFQznJOyn7NVTDp32T0DglYifgqCk3r9TJK2jpn33E3tK9LYPwMtqk+U3aG+fpnbND XzY1xwZouKJo4x+fN7GsLN3pETQ/GY48o1Zw+GoCH2RzO5t/hVmooNhMcQYFcMDTuszj Vm0Q== X-Gm-Message-State: AOJu0YykBetcEY4A7WWPNYrLiCKrE4v1x64WGOgPumfgbVEX/I88uM5t UyOlixeus8lf6+vuhZx+r/flOtPloE/u0GRrNNTX5G51fZCMal8SrogSOWr+XSKiWmsRCkTfSG6 EyRUlIkY= X-Gm-Gg: ATEYQzxDvaQo/3yJK6gSLvSRgAnqZ+AMQZTSLtKhvOISRijQEINReIIF87m0QH6BP7y pKKKsVdK2xSscKqlbb3jEBzpw3G58FbM/0nYk7vAAMJkRFYxyzda2n1yCbTNBaj9gQgOKJtAhkN ZEbSdP2Crhk+Cygtx4CyqItNURgv4W0aNlIrOGr0Ewl5QviwDgCcKszYsss8aHA9B0u2Hk95xqH 3oEaxFtiMjpHlyAVucvBuQBIQhauB+oXjHHDGuJSqghNsZS8WXChxXHW/Zp7FsGMGbOsFfCT+bG /9uWPY5/LyIw0hTbw1YiXuupLm1YT1HmY4jHElAdg0GzMV/gzXbFkcGKTcT1gjUl9bUXVrlewG2 xoe9/+NCPnf5FFFyvUPkE5iVBNYf68raTjhIEcZBbpmpQoCoi63toeHaF8GHYRRv9yTaS8St1rK Lm4foeMOLDp9iJgP5V1z+btTcSxHNRa//Mo6i2dRjOmkbJ3Lnfx1Ua7sjCDL4YS01nXdKvDIMa1 48BKg== X-Received: by 2002:a05:600c:4e4e:b0:485:363b:fafd with SMTP id 5b1f17b1804b1-485363bfc84mr49922665e9.6.1773009562321; Sun, 08 Mar 2026 15:39:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 42/49] hppa: Introduce HPPACPUDef Date: Sun, 8 Mar 2026 23:34:26 +0100 Message-ID: <20260308223433.25503-43-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009587799158500 From: Anton Johansson Restructures the CPU class heirarchy to clarify model names and allow for per-model configuration options via HPPACPUDef. 32-bit HPPA is assumed to run a PA-7300LC, and 64-bit assumed to run a PA-8700. A new PA-8500 model is added, which will later be used by the A400 machine. All CPU models are made into children of the now abstract TYPE_HPPA_CPU base class. Two fields are added to HPPACPUDef describing the size of the physical address space, and whether or not the CPU uses the PA-RISC 2.0 architecture. The latter was previously a field in CPUHPPAState. phys_addr_bits is currently set but unused, and will be used in the following commit. Likewise, PA-8700 is moved to use 44 bit physical addresses in a followup commit to not break bisection. References to "hppa/hppa64" models in test cases are also updated. Reviewed-by: Helge Deller Signed-off-by: Anton Johansson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260305-hppa-c3600-v6-1-d51526e5269c@rev.ng> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/hppa/cpu-qom.h | 8 +++++- target/hppa/cpu.h | 24 +++++++++++++--- hw/hppa/machine.c | 21 ++++++++------ linux-user/hppa/elfload.c | 2 +- target/hppa/cpu.c | 50 +++++++++++++++++++++++++-------- tests/qtest/machine-none-test.c | 2 +- 6 files changed, 80 insertions(+), 27 deletions(-) diff --git a/target/hppa/cpu-qom.h b/target/hppa/cpu-qom.h index 5c454bf543b..7541c25b3d5 100644 --- a/target/hppa/cpu-qom.h +++ b/target/hppa/cpu-qom.h @@ -23,7 +23,13 @@ #include "hw/core/cpu.h" =20 #define TYPE_HPPA_CPU "hppa-cpu" -#define TYPE_HPPA64_CPU "hppa64-cpu" + +#define HPPA_CPU_TYPE_SUFFIX "-" TYPE_HPPA_CPU +#define HPPA_CPU_TYPE_NAME(name) (name HPPA_CPU_TYPE_SUFFIX) + +#define TYPE_HPPA_CPU_PA_7300LC HPPA_CPU_TYPE_NAME("pa-7300lc") +#define TYPE_HPPA_CPU_PA_8500 HPPA_CPU_TYPE_NAME("pa-8500") +#define TYPE_HPPA_CPU_PA_8700 HPPA_CPU_TYPE_NAME("pa-8700") =20 OBJECT_DECLARE_CPU_TYPE(HPPACPU, HPPACPUClass, HPPA_CPU) =20 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 092e647ccf5..43b4882fb4f 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -270,8 +270,6 @@ typedef struct CPUArchState { /* Fields up to this point are cleared by a CPU reset */ struct {} end_reset_fields; =20 - bool is_pa20; - target_ulong kernel_entry; /* Linux kernel was loaded here */ target_ulong cmdline_or_bootorder; target_ulong initrd_base, initrd_end; @@ -290,6 +288,18 @@ struct ArchCPU { QEMUTimer *alarm_timer; }; =20 +/** + * HPPACPUDef: + * @phys_addr_bits: Number of bits in the physical address space. + * @is_pa20: Whether the CPU model follows the PA-RISC 2.0 or 1.1 spec. + * + * Configuration options for a HPPA CPU model. + */ +typedef struct HPPACPUDef { + uint8_t phys_addr_bits; + bool is_pa20; +} HPPACPUDef; + /** * HPPACPUClass: * @parent_realize: The parent class' realize handler. @@ -302,11 +312,17 @@ struct HPPACPUClass { =20 DeviceRealize parent_realize; ResettablePhases parent_phases; + const HPPACPUDef *def; }; =20 -static inline bool hppa_is_pa20(const CPUHPPAState *env) +static inline const HPPACPUDef *hppa_def(CPUHPPAState *env) { - return env->is_pa20; + return HPPA_CPU_GET_CLASS(env_cpu(env))->def; +} + +static inline bool hppa_is_pa20(CPUHPPAState *env) +{ + return hppa_def(env)->is_pa20; } =20 static inline int HPPA_BTLB_ENTRIES(CPUHPPAState *env) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index f55e84529f6..5d0d4de09ed 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -801,13 +801,13 @@ static void hppa_machine_common_class_init(ObjectClas= s *oc, const void *data) static void HP_B160L_machine_init_class_init(ObjectClass *oc, const void *= data) { static const char * const valid_cpu_types[] =3D { - TYPE_HPPA_CPU, + TYPE_HPPA_CPU_PA_7300LC, NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "HP B160L workstation"; - mc->default_cpu_type =3D TYPE_HPPA_CPU; + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_7300LC; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_B160L_init; mc->is_default =3D true; @@ -817,13 +817,13 @@ static void HP_B160L_machine_init_class_init(ObjectCl= ass *oc, const void *data) static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *= data) { static const char * const valid_cpu_types[] =3D { - TYPE_HPPA64_CPU, + TYPE_HPPA_CPU_PA_8700, NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "HP C3700 workstation"; - mc->default_cpu_type =3D TYPE_HPPA64_CPU; + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_8700; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_C3700_init; mc->max_cpus =3D HPPA_MAX_CPUS; @@ -833,13 +833,13 @@ static void HP_C3700_machine_init_class_init(ObjectCl= ass *oc, const void *data) static void HP_A400_machine_init_class_init(ObjectClass *oc, const void *d= ata) { static const char * const valid_cpu_types[] =3D { - TYPE_HPPA64_CPU, + TYPE_HPPA_CPU_PA_8500, NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "HP A400-44 workstation"; - mc->default_cpu_type =3D TYPE_HPPA64_CPU; + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_8500; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_A400_init; mc->max_cpus =3D HPPA_MAX_CPUS; @@ -849,13 +849,18 @@ static void HP_A400_machine_init_class_init(ObjectCla= ss *oc, const void *data) static void HP_715_machine_init_class_init(ObjectClass *oc, const void *da= ta) { static const char * const valid_cpu_types[] =3D { - TYPE_HPPA_CPU, + TYPE_HPPA_CPU_PA_7300LC, NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "HP 715/64 workstation"; - mc->default_cpu_type =3D TYPE_HPPA_CPU; + /* + * Although the 715 workstation should use a 7100LC, it can be safely + * modeled as a 7300LC as the difference is a moving of the L1 data ca= che + * to on-chip. + */ + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_7300LC; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_715_init; /* can only support up to max. 8 CPUs due inventory major numbers */ diff --git a/linux-user/hppa/elfload.c b/linux-user/hppa/elfload.c index 46007087020..7f7ece6dc19 100644 --- a/linux-user/hppa/elfload.c +++ b/linux-user/hppa/elfload.c @@ -8,7 +8,7 @@ =20 const char *get_elf_cpu_model(uint32_t eflags) { - return "hppa"; + return "pa-7300lc"; } =20 const char *get_elf_platform(CPUState *cs) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 714f3bbdaf7..cc755da8be2 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -203,13 +203,6 @@ static void hppa_cpu_realizefn(DeviceState *dev, Error= **errp) tcg_cflags_set(cs, CF_PCREL); } =20 -static void hppa_cpu_initfn(Object *obj) -{ - CPUHPPAState *env =3D cpu_env(CPU(obj)); - - env->is_pa20 =3D !!object_dynamic_cast(obj, TYPE_HPPA64_CPU); -} - static void hppa_cpu_reset_hold(Object *obj, ResetType type) { HPPACPUClass *scc =3D HPPA_CPU_GET_CLASS(obj); @@ -236,9 +229,14 @@ static void hppa_cpu_reset_hold(Object *obj, ResetType= type) =20 static ObjectClass *hppa_cpu_class_by_name(const char *cpu_model) { - g_autofree char *typename =3D g_strconcat(cpu_model, "-cpu", NULL); + ObjectClass *oc; + char *typename; =20 - return object_class_by_name(typename); + typename =3D g_strdup_printf(HPPA_CPU_TYPE_NAME("%s"), cpu_model); + oc =3D object_class_by_name(typename); + g_free(typename); + + return oc; } =20 #ifndef CONFIG_USER_ONLY @@ -279,6 +277,14 @@ static const TCGCPUOps hppa_tcg_ops =3D { #endif /* !CONFIG_USER_ONLY */ }; =20 +static void hppa_cpu_class_base_init(ObjectClass *oc, const void *data) +{ + HPPACPUClass *acc =3D HPPA_CPU_CLASS(oc); + /* Make sure all CPU models define a HPPACPUDef */ + g_assert(!object_class_is_abstract(oc) && data !=3D NULL); + acc->def =3D data; +} + static void hppa_cpu_class_init(ObjectClass *oc, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -313,14 +319,34 @@ static const TypeInfo hppa_cpu_type_infos[] =3D { .parent =3D TYPE_CPU, .instance_size =3D sizeof(HPPACPU), .instance_align =3D __alignof(HPPACPU), - .instance_init =3D hppa_cpu_initfn, - .abstract =3D false, + .abstract =3D true, .class_size =3D sizeof(HPPACPUClass), .class_init =3D hppa_cpu_class_init, + .class_base_init =3D hppa_cpu_class_base_init, }, { - .name =3D TYPE_HPPA64_CPU, + .name =3D TYPE_HPPA_CPU_PA_7300LC, .parent =3D TYPE_HPPA_CPU, + .class_data =3D &(const HPPACPUDef) { + .phys_addr_bits =3D 32, + .is_pa20 =3D false, + }, + }, + { + .name =3D TYPE_HPPA_CPU_PA_8500, + .parent =3D TYPE_HPPA_CPU, + .class_data =3D &(const HPPACPUDef) { + .phys_addr_bits =3D 40, + .is_pa20 =3D true, + }, + }, + { + .name =3D TYPE_HPPA_CPU_PA_8700, + .parent =3D TYPE_HPPA_CPU, + .class_data =3D &(const HPPACPUDef) { + .phys_addr_bits =3D 40, + .is_pa20 =3D true, + }, }, }; =20 diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-tes= t.c index c1e22dcecc7..bafd7d660ec 100644 --- a/tests/qtest/machine-none-test.c +++ b/tests/qtest/machine-none-test.c @@ -47,7 +47,7 @@ static struct arch2cpu cpus_map[] =3D { { "tricore", "tc1796" }, { "xtensa", "dc233c" }, { "xtensaeb", "fsf" }, - { "hppa", "hppa" }, + { "hppa", "pa-7300lc" }, { "riscv64", "rv64" }, { "riscv32", "rv32" }, { "rx", "rx62n" }, --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009581; cv=none; d=zohomail.com; s=zohoarc; b=QzJx1zKPs2RciwSm4BCxVOHvJJevFb2WPapL10FOgPzo3vrMGUYoJY0RNSs6oLsp7e1B6y53avfsZ6/fyCy6MwuV5c/PuyB5V7bQ2cZRGt7ulfW7XNwWhui4wT5JJ+q670y3yV5HR1NPbkBIAiQLgd3oWM6OHzAfmw2x+CnU92U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009581; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=my/LVrxysf1jEbG5Gn9om1dyx26cxh6RaihKhmPCfeA=; b=A9x1s0WG3oAehpE0pBTqjxT/gxLTsMPxxSvlhtg8gjd2TE3TxdSJ2U1aESVfO67SI07HCnWA34TE0HEMqSQxCOYKJgP2FPDbBqceapGvHATYNe2fwE6gx/90XaPuVjIYrludHMY6V55fhkvtQEw4sW1Vv4+2HQ6AZiOoCzPC2mY= 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 1773009581162746.3883224337288; Sun, 8 Mar 2026 15:39:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMmf-0007P3-Es; Sun, 08 Mar 2026 18:39:37 -0400 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 1vzMma-0007AB-Np for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:34 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMmY-0003l2-P3 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:32 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-480706554beso122880965e9.1 for ; Sun, 08 Mar 2026 15:39:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485276b7547sm222008405e9.12.2026.03.08.15.39.28 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009569; x=1773614369; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=my/LVrxysf1jEbG5Gn9om1dyx26cxh6RaihKhmPCfeA=; b=EuSrXXD8k42IABg4q3YIOGNWMn3rzzWJLlaa/403vLvWJsBmouWwKf1f3QTXJxznf9 PsjYTpQLMpSShPvdv98Wg5VvWWL1TnfPqRMw+WrHwqiTzQNIy7AEXVrNQtJb7a6zsK+Q qhC+jvbIE3hOiTvDINDL8R+hgdvucCebOEKC6k4gR1FnBGeaj8dwe3TjsEK+KlJ0oKYd V9C0gvzuCvpG/u0S5Z9kCeIhl3uIL/+wSPSCDN4ci1uykcC/uU4tFAOCIhQa/oNwDmqb i4lAsorNKhXhMWhB6TWC6gjjqeLhnWkoTFGAa/ZoHZFknUY7LBwkqgwuAsVlIGFGz0GK aTnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009569; x=1773614369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=my/LVrxysf1jEbG5Gn9om1dyx26cxh6RaihKhmPCfeA=; b=P77r23cysD/3wL3v/eCP2/BU6LMot65eYt/nOQvjKCDIPwLchtPo2tJJue+SdhbCyO 3r7qD9vVFWcf6PHfG/iS8KktNir2NbakNG2JG6crbXKQL0mcseZTk9uAdQQGxa1SuJLN jfZAvpEUsxjgzrosZ6WNXj5I9+q2/FkAOoivT4OpS5kq2MnY4LTAsrLjqpGINGWNK/7l f06AMMKB3kjoJ6be04hjgqTjJXhzbwLyiq0AkpKmQvBXvh5Pm4FO5h7WpLjNwrx567Jj IEDeJxIcRPnMcFO5tW8lo8KAyRqcMLgeu0VYh8JUhbvKaJ1m5OycR+8Q5295Vo4gR627 EgvA== X-Gm-Message-State: AOJu0Yxf/CG0e9514eXw26MU8YZA15il1jfJ4veNo7xYIp/seSbI3o8v 6I7Xl1bd+dJu562f53Ajf1yM2NJzQBCaQ8A0l2ZyzdVrNYginpQNp6XcfE2flcuz0u2XlOk0xzE ocxYGPqA= X-Gm-Gg: ATEYQzwuCMG6ipZpQA0T6A0EUM6+Yq8Q57WiqPupqOOjYZ1WVvg6pPXry56zlaf0Rda NAzxBTpgF27vWoZ6Y5FLfW8eRO1A+9vEQNh12EOzleD0FNH75Kun2iHEQjYRhiOhpN51bJvOPGr H6Lt0WJU9+VupO1zc6hRXWO64fgkcuaBv1rNEIRK+YsjxLB0yhMPLMSXVbz/Mq1INyKDktQXRuO Fo+b+NWOibwuGOPG0iCaJmET5dyEDWMHqJusKV2pA7Mp7A5V3Hd4oDzLhpC+VYFys/SCO3qjpRY GlRaIeJML30pcgHd+H2rA3LlPhmVJz7wPZU0SV3qDJ1KMLPOAvEiAxPVmwSl+pRWCH+NxCr4t1t lIvdn2wABKEjdCjgqQggdKfsiReqTAVJYvfuMzaZfMDEe9A5oHzQx45+KGRAJRAu3S9qlABJhr1 96bWMI/jJrUDW94Seq6cVE0Vv8/WviVHfCe3gF0S/DZvFyCZxiCDsSuN23InvTK3Amos+POo5id dtz3Q== X-Received: by 2002:a05:600c:34d0:b0:477:5cc6:7e44 with SMTP id 5b1f17b1804b1-48526923c5cmr153565385e9.11.1773009568874; Sun, 08 Mar 2026 15:39:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 43/49] hppa: Get physical address space bits from HPPACPUDef Date: Sun, 8 Mar 2026 23:34:27 +0100 Message-ID: <20260308223433.25503-44-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1773009582756154100 From: Anton Johansson Signed-off-by: Anton Johansson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260305-hppa-c3600-v6-2-d51526e5269c@rev.ng> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/pci-host/astro.h | 2 ++ target/hppa/cpu.h | 11 ++++++++--- hw/hppa/machine.c | 15 +++++++++----- hw/pci-host/astro.c | 8 +++++++- target/hppa/cpu.c | 5 +++++ target/hppa/mem_helper.c | 39 +++++++++++-------------------------- 6 files changed, 43 insertions(+), 37 deletions(-) diff --git a/include/hw/pci-host/astro.h b/include/hw/pci-host/astro.h index 832125a05af..fce052c9f86 100644 --- a/include/hw/pci-host/astro.h +++ b/include/hw/pci-host/astro.h @@ -82,6 +82,8 @@ struct AstroState { uint64_t tlb_tcnfg; uint64_t tlb_pdir_base; =20 + uint8_t phys_addr_bits; + struct ElroyState *elroy[ELROY_NUM]; =20 MemoryRegion this_mem; diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 43b4882fb4f..7d47afe8efa 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -320,6 +320,11 @@ static inline const HPPACPUDef *hppa_def(CPUHPPAState = *env) return HPPA_CPU_GET_CLASS(env_cpu(env))->def; } =20 +static inline uint8_t hppa_phys_addr_bits(CPUHPPAState *env) +{ + return hppa_def(env)->phys_addr_bits; +} + static inline bool hppa_is_pa20(CPUHPPAState *env) { return hppa_def(env)->is_pa20; @@ -352,9 +357,9 @@ static inline vaddr hppa_form_gva(CPUHPPAState *env, ui= nt64_t spc, return hppa_form_gva_mask(env->gva_offset_mask, spc, off); } =20 -hwaddr hppa_abs_to_phys_pa1x(vaddr addr); -hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr); -hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr); +hwaddr hppa_abs_to_phys_pa1x(uint8_t phys_addr_bits, vaddr addr); +hwaddr hppa_abs_to_phys_pa2_w0(uint8_t phys_addr_bits, vaddr addr); +hwaddr hppa_abs_to_phys_pa2_w1(uint8_t phys_addr_bits, vaddr addr); =20 /* * Since PSW_{I,CB} will never need to be in tb->flags, reuse them. diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 5d0d4de09ed..6b69a304c2a 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -179,19 +179,21 @@ static uint64_t linux_kernel_virt_to_phys(void *opaqu= e, uint64_t addr) return addr; } =20 +static HPPACPU *cpu[HPPA_MAX_CPUS]; +static uint64_t firmware_entry; + static uint64_t translate_pa10(void *dummy, uint64_t addr) { - return hppa_abs_to_phys_pa1x(addr); + const uint8_t pa_bits =3D hppa_phys_addr_bits(&cpu[0]->env); + return hppa_abs_to_phys_pa1x(pa_bits, addr); } =20 static uint64_t translate_pa20(void *dummy, uint64_t addr) { - return hppa_abs_to_phys_pa2_w0(addr); + const uint8_t pa_bits =3D hppa_phys_addr_bits(&cpu[0]->env); + return hppa_abs_to_phys_pa2_w0(pa_bits, addr); } =20 -static HPPACPU *cpu[HPPA_MAX_CPUS]; -static uint64_t firmware_entry; - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { @@ -685,6 +687,9 @@ static AstroState *astro_init(void) DeviceState *dev; =20 dev =3D qdev_new(TYPE_ASTRO_CHIP); + object_property_set_int(OBJECT(dev), "phys-addr-bits", + hppa_phys_addr_bits(&cpu[0]->env), + &error_abort); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 return ASTRO_CHIP(dev); diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c index 00a904277c0..626aa9ce223 100644 --- a/hw/pci-host/astro.c +++ b/hw/pci-host/astro.c @@ -303,7 +303,7 @@ static IOMMUTLBEntry astro_translate_iommu(IOMMUMemoryR= egion *iommu, * language which not-coincidentally matches the PSW.W=3D0 mapping. */ if (addr <=3D UINT32_MAX) { - entry =3D hppa_abs_to_phys_pa2_w0(addr); + entry =3D hppa_abs_to_phys_pa2_w0(s->phys_addr_bits, addr); } else { entry =3D addr; } @@ -910,6 +910,10 @@ static void astro_realize(DeviceState *obj, Error **er= rp) } } =20 +static const Property astro_props[] =3D { + DEFINE_PROP_UINT8("phys-addr-bits", AstroState, phys_addr_bits, 32), +}; + static void astro_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -922,6 +926,8 @@ static void astro_class_init(ObjectClass *klass, const = void *data) * be created without that hardware */ dc->user_creatable =3D false; + + device_class_set_props(dc, astro_props); } =20 static const TypeInfo astro_chip_info =3D { diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index cc755da8be2..5895b9d7c09 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -283,6 +283,11 @@ static void hppa_cpu_class_base_init(ObjectClass *oc, = const void *data) /* Make sure all CPU models define a HPPACPUDef */ g_assert(!object_class_is_abstract(oc) && data !=3D NULL); acc->def =3D data; + /* + * Verify assumptions made in hppa_abs_to_phys_pa2_w1() on the size + * of the physical address space. + */ + g_assert(acc->def->phys_addr_bits <=3D 54); } =20 static void hppa_cpu_class_init(ObjectClass *oc, const void *data) diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 9199d1e06ab..a4b382069d8 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -29,29 +29,12 @@ #include "hw/core/cpu.h" #include "trace.h" =20 -/* - * 64-bit (PA-RISC 2.0) machines are assumed to run PA-8700, and 32-bit - * machines 7300LC. This should give 44 and 32 bits of physical address - * space respectively. - * - * CPU model Physical address space bits - * PA-7000--7300LC 32 - * PA-8000--8600 40 - * PA-8700--8900 44 - * - * FIXME: However, the SeaBIOS firmware that is that tested against - * uses 40-bit physical addresses, despite supposedly running a C3700 - * with a PA-8700 cpu, so use 40-bits for 64-bit. - */ -#define HPPA_PHYS_ADDR_SPACE_BITS_PA20 40 -#define HPPA_PHYS_ADDR_SPACE_BITS_PA1X 32 - -hwaddr hppa_abs_to_phys_pa1x(vaddr addr) +hwaddr hppa_abs_to_phys_pa1x(uint8_t phys_addr_bits, vaddr addr) { - return extract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA1X); + return extract64(addr, 0, phys_addr_bits); } =20 -hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr) +hwaddr hppa_abs_to_phys_pa2_w1(uint8_t phys_addr_bits, vaddr addr) { /* * Figure H-8 "62-bit Absolute Accesses when PSW W-bit is 1" describes @@ -64,11 +47,10 @@ hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr) * Since the supported physical address space is below 54 bits, the * H-8 algorithm is moot and all that is left is to truncate. */ - QEMU_BUILD_BUG_ON(HPPA_PHYS_ADDR_SPACE_BITS_PA20 > 54); - return sextract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20); + return sextract64(addr, 0, phys_addr_bits); } =20 -hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr) +hwaddr hppa_abs_to_phys_pa2_w0(uint8_t phys_addr_bits, vaddr addr) { /* * See Figure H-10, "Absolute Accesses when PSW W-bit is 0", @@ -89,7 +71,7 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr) * is what can be seen on physical machines too. */ addr =3D (uint32_t)addr; - addr |=3D -1ull << (HPPA_PHYS_ADDR_SPACE_BITS_PA20 - 4); + addr |=3D -1ull << (phys_addr_bits - 4); } return addr; } @@ -231,15 +213,16 @@ int hppa_get_physical_address(CPUHPPAState *env, vadd= r addr, int mmu_idx, =20 /* Virtual translation disabled. Map absolute to physical. */ if (MMU_IDX_MMU_DISABLED(mmu_idx)) { + const uint8_t phys_addr_bits =3D hppa_phys_addr_bits(env); switch (mmu_idx) { case MMU_ABS_W_IDX: - phys =3D hppa_abs_to_phys_pa2_w1(addr); + phys =3D hppa_abs_to_phys_pa2_w1(phys_addr_bits, addr); break; case MMU_ABS_IDX: if (hppa_is_pa20(env)) { - phys =3D hppa_abs_to_phys_pa2_w0(addr); + phys =3D hppa_abs_to_phys_pa2_w0(phys_addr_bits, addr); } else { - phys =3D hppa_abs_to_phys_pa1x(addr); + phys =3D hppa_abs_to_phys_pa1x(phys_addr_bits, addr); } break; default: @@ -580,7 +563,7 @@ static void itlbt_pa20(CPUHPPAState *env, target_ulong = r1, /* Align per the page size. */ ent->pa &=3D TARGET_PAGE_MASK << mask_shift; /* Ignore the bits beyond physical address space. */ - ent->pa =3D sextract64(ent->pa, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20); + ent->pa =3D sextract64(ent->pa, 0, hppa_phys_addr_bits(env)); =20 ent->t =3D extract64(r2, 61, 1); ent->d =3D extract64(r2, 60, 1); --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009590; cv=none; d=zohomail.com; s=zohoarc; b=CwhEgVbAJDI4g6omXtPGqKvmi8Mz+7IK2GaGP9HayVEZG7e8XuW7YA52Kk90VarjQ/ZzNlJxaerqoDeIRZAth72CSLR9cC2LyloY03FF9arFDZmeT+n8o88TZgVyss7wPcppapptADS3MK3PlvnQGOSk8jDPlEsqEY1DocMZEu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009590; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=nFoSu2Lso6VlGIPAH1rthi5SRiSZdN8KLe/bg6opams=; b=THzxcQYdRAx9bTvE5ITPi7EH8/iT2VDw6G+xos9uGeukt6t+pzNQyLzFfVzUT1Dy2hPFHf45coKqgzaQAX+zPSLUmAJEK/F37wbaigwqk7xjLI0FbVPKM/zEqWkpTKaRodgK9e3YoFpMDMKSZzVvIYTWnXW45UqaEZc/91PInk0= 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 1773009590455494.49273677434564; Sun, 8 Mar 2026 15:39:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMmk-0007XO-QE; Sun, 08 Mar 2026 18:39:44 -0400 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 1vzMmi-0007T4-GQ for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:40 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMmg-0003m7-G5 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:39 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-48534e9076fso4362445e9.0 for ; Sun, 08 Mar 2026 15:39:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fae538bsm361560895e9.7.2026.03.08.15.39.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009575; x=1773614375; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nFoSu2Lso6VlGIPAH1rthi5SRiSZdN8KLe/bg6opams=; b=YXz8jnYHUaVeVQTfIyjtDhycvWdR2s5aArc8ymLCwYpZgbjmp5dx6xYCuAHhhR8cO6 Nl05D3st4O1x7889wPmnbreWAkUHERIluw1qaP7Gf3weiSgTAJFU770Ug+znkrdgWi8F KP4QZUDR+pnbcWTVv+khq1dgAhrMfLAT9B8udokVIQd1HFcPic0IUltOos/2uzO4gQDq /VnB7E5TtNmmGgtWVoMXNGxlK48BmSuC/1ZEIDWqzeIr2T9BWDDjgR73cK5ywS4y0WHT TiHzbC2j7k8qwcYL2LY5EYOvH/qNhxrNXwc1ZvDSIeTgjBMQR70rmzG6MUW85FPZG14N 1f7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009575; x=1773614375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nFoSu2Lso6VlGIPAH1rthi5SRiSZdN8KLe/bg6opams=; b=w5Usx1gZwhxY/rnADaaltkUfiVtO8v+PtGXJNMGd3bbOA/WNpMu8X8i9CIloCZQOU0 YPLHDo2Huq+aVdkqRq6DMIOI5MHinoIgjjeXdfzWOutzUX/j1q5jPx99L6yNY6OGnvyA 8yUnWvCxmx9/GV1PX3f2h0EhPugnX+yhOtctZFwn8MtstVSz2y5ayeNfCPWhFIOkDhzZ CYMjGVvdS1n9FkPw0vXqkkQhIz+PTFWgCkzGnZFQXsD7G2G3k/fk6N4ElwAwDZW3dEmt wmlE0KI5WRliTmY98VY1Lwr86DCN8JHK4HXo+zizUvOVTIE+xwJusOA+4Rg/5bFlwtJk xlew== X-Gm-Message-State: AOJu0Yyjm2YJcIa2mvWUWsp4pDvyAdiDHApX5t0sqvik/ziXjWtdjxo1 eyjbtW8bVobUT8n0UiBve9WnUBB3Gul3OPoNW1PH/zamOXUCSi55Ky/e7OfWqOuUJQo1qTyZEPI mVWH+org= X-Gm-Gg: ATEYQzxKaulAONQdTxu65PgJ6xHPzvmHDyTRaGAllgDiHU6j0sjeo/jT3bqTDR3s1y/ 2QDNRRWNqEsXbVza4k8zrVxjMVQCK079Hoz1WEkBq+GAL5jtyjoMAKsWpV0KKAaanOrNSOaZ+qC JIGdYzgc4C4aoZNGtaquGISFDPGbWVCn+LYbkA+zXCggcXvEpv4IVsjPrQJN9F+yCI+/cwgAfi2 ni0HLwDj/ugb+f7a9asx08ubOfDydCx00F0CAJeO2K4YPBtfpOLOxJCohUlkgW8d8nJ6CzGverg M1tvI7S2j2PnncgoQm+J7DSzlOG9IXB6e7hhs5QwuIYMnAKLebcVI21kxh7yucHEg0VG1lDzmz4 9rd6oQ+E6esk03gNaQRBLFtQ0eHq+mxS/ieUXBdlbs1zjn32+p1gP2xvVuONKrQVPWiJIJMrJGL 4DPxEAGswEAc0Cy/2ShBsWRpMsJ5na2eCaysEYW0CiOGF1T7r5YLpe+9J0EumP+yXTMfF7svS75 My8/A== X-Received: by 2002:a05:600c:c11c:b0:483:c12b:fe3c with SMTP id 5b1f17b1804b1-485269188damr110302115e9.4.1773009575395; Sun, 08 Mar 2026 15:39:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 44/49] hppa: Use 44 bit physical addresses for PA-8700 Date: Sun, 8 Mar 2026 23:34:28 +0100 Message-ID: <20260308223433.25503-45-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 1773009592785154100 From: Anton Johansson This is in line with the PA-8700 specification which demands 44 bits. However, this change breaks the SeaBIOS functional tests as the firmware assumes 40 bit physical addresses. Therefore, change the functional tests to instead run on an A400 which has the expected physical address space size. Reviewed-by: Helge Deller Signed-off-by: Anton Johansson Message-ID: <20260305-hppa-c3600-v6-3-d51526e5269c@rev.ng> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/hppa/cpu.c | 2 +- tests/functional/hppa/test_seabios.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 5895b9d7c09..92027d129a7 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -349,7 +349,7 @@ static const TypeInfo hppa_cpu_type_infos[] =3D { .name =3D TYPE_HPPA_CPU_PA_8700, .parent =3D TYPE_HPPA_CPU, .class_data =3D &(const HPPACPUDef) { - .phys_addr_bits =3D 40, + .phys_addr_bits =3D 44, .is_pa20 =3D true, }, }, diff --git a/tests/functional/hppa/test_seabios.py b/tests/functional/hppa/= test_seabios.py index 661b2464e13..bdb9d534efe 100755 --- a/tests/functional/hppa/test_seabios.py +++ b/tests/functional/hppa/test_seabios.py @@ -12,7 +12,7 @@ class HppaSeabios(QemuSystemTest): =20 timeout =3D 5 - MACH_BITS =3D {'B160L': 32, 'C3700': 64} + MACH_BITS =3D {'B160L': 32, 'A400': 64} =20 def boot_seabios(self): mach =3D self.machine @@ -28,7 +28,7 @@ def test_hppa_32(self): self.boot_seabios() =20 def test_hppa_64(self): - self.set_machine('C3700') + self.set_machine('A400') self.boot_seabios() =20 if __name__ =3D=3D '__main__': --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009604; cv=none; d=zohomail.com; s=zohoarc; b=kKz3119+y2YTqIvobK9z65JWbtUWG3pPr7WgeMo6LorxNyYCaVCa1DhG3iOzZ6mExFBh0Ejbz17Npvq8mTkzUVExf3qUoLzimvIO6FKdvb4JIDgTou0Zi6uHxLJSG1pO8psrxd3T5WhBSFN/RjSaRuAeH3LFSjt/Dgu9EbtIooU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009604; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=TwvQ29jY5wUxFvvCaCnGTpkivDzrqW+t2E04DI+HqDU=; b=TTnvQkzJ24EyRZZ8nPBwtPsh3zMa9JztWKt7FrnI+8VYkG0k4nNhORKZf3TByGgXR35wTnMTwoywnG5dKUFU8dsl4DE67F13nVDaiLfxxX5OA+LMgnM/RV3kTfFFyTL9jFpA2DJVVYGaXqbImeIzoLU1eFSM+fHV/g7bIUR6cfo= 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 1773009604153866.2443240991906; Sun, 8 Mar 2026 15:40:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMn1-0007xD-Qc; Sun, 08 Mar 2026 18:39:59 -0400 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 1vzMmn-0007hl-QX for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:48 -0400 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 1vzMmm-0003n2-6s for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:45 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso89225145e9.1 for ; Sun, 08 Mar 2026 15:39:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad97abasm19409055f8f.10.2026.03.08.15.39.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009582; x=1773614382; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TwvQ29jY5wUxFvvCaCnGTpkivDzrqW+t2E04DI+HqDU=; b=EyVvm0/N53qBub1LTkAUMqXOwyrA2eMazcYCsTQetZ47F+vaP+0wuNYsGIiyvbwrrr JZJfLCy6eRUKaOkKRUnzdqB6JcJ+kiyfikN5HZ3pQ+adEqxtDC7WNCtgjtlCcKJHF2dr b5iBRzRVIOaVczNE/l+wb9HXWvgYwSGcAIc7ZDI0SjVHe9G2sUcUqHnY/kRyM96rnLpF ZxwRHRtyMAyI6H8siR3Misj9/jNG6fTx4dNN3uJPveeCdaFemEa7Ja3nQc36Y9wove6P jQ6oppr+eLKZATeHGdhv0IFgK9/+sj8iQFOR2UTnGkC9kmpYsJpRZOXcbJ5USbJR1Nib Zujg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009582; x=1773614382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=TwvQ29jY5wUxFvvCaCnGTpkivDzrqW+t2E04DI+HqDU=; b=CS5EdHI8XUNL0bYnZ1Jxd/kmZa3q17y1RoPlJy/pxjKFjxPW5jW8H6FCKxJzQtRtbd yQ27ePdzAc56lJFdMnDY7qmsMvT8AGfevOfKgaybnIo3cF46fh/S/p73fMSqUBTJiTLG xW33Vg7HE8nfp5w/qB5nM0WdzR3iNQ+a+RYaf1dribkmT9yCBGMQiYAjw/6mtTtI1m65 TjXgh1bSxduV7tGYSDuXx/daN6TmVQRvYbOEYJCYDPbWj6UeeJT8+82MJyQSvcBQu2Vf aqxVFiNWbHZxvS9/JTIWIoI0lLV2Gguq9DUYg3/gU6NV4H4ku3/FrfboJj3waIYgJQ5W A7jA== X-Gm-Message-State: AOJu0Yx0Ju/9eFJ5ELnsOKQ+Q4TXMKkaEpnlHW6Ce17k7Yj38LEjCVG5 lRQMZitQdiEUuuIiu4EtftgyJZVGm3IOV1mpPtfK8Ui/XuRQ7xXZclPiGRvG9h+w8q9Fsxsz2xp EHT1HSrQ= X-Gm-Gg: ATEYQzyHlRpnz+XHI7p5Irx98ckC14df7rQLGrmD8agMXxRDFW71vw7NQhip6su+ngc OGTKbU8R2AznTlJNICQqtAm/Y4pJu+594lt/CrPyPU1GhaeZydudkvCKcx2dzJKAiqi7MnRHBfE BZ3KWwmEd8wDgPE+ws8RSPoHKBFqiSG71TJD7JhtiyDOOXDmU3zF8Eja6Z7K1vFDo8feTZIO4fr Nu8aX3/BoTVn5XKy2HSYksG/HQyxZRu/c+t/csVOWqmPh5D5e3+pWXyaKWrmc8b+8t2kh330+Es bKqj+vP3nAt3xXW9/zK+dh2mzhBHulcq3npX4t2lx0Zhpqo49EXy/2/osJs2r5sJLp2RZgIsmcz v33XgY8smICgkIX0N0rPJyuw+0xKpTotbHU+Tr8HhlIkf6A820Ij1fhuKkKVqCSIbKq5owx9yHk ECeCUaE6rgcJMqftu3Y8NdFzQQwF3fQAaZGtRKN+SefbwAiuksYtiCAfUWL1Fdk4dpX2tPRtLwp jpvYQ== X-Received: by 2002:a05:600c:1d1e:b0:483:709e:f239 with SMTP id 5b1f17b1804b1-48526951ca9mr161802845e9.22.1773009581873; Sun, 08 Mar 2026 15:39:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 45/49] ati-vga: Allow setting EDID parameters directly Date: Sun, 8 Mar 2026 23:34:29 +0100 Message-ID: <20260308223433.25503-46-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009605747158500 From: BALATON Zoltan The EDID generation has some parameters that can be set via properties but since ati-vga uses i2c-ddc it is only accessible with -global option. Expose these properties so users can more easily set it via e.g. -device ati-vga,xres=3D1024,yres=3D768. Signed-off-by: BALATON Zoltan Message-ID: <20260305233717.1D08F5969F6@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_int.h | 2 ++ hw/display/ati.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index 98f57ca5fa4..874c63eb544 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -13,6 +13,7 @@ #include "qemu/units.h" #include "hw/pci/pci_device.h" #include "hw/i2c/bitbang_i2c.h" +#include "hw/display/i2c-ddc.h" #include "vga_int.h" #include "qom/object.h" =20 @@ -108,6 +109,7 @@ struct ATIVGAState { QEMUCursor *cursor; QEMUTimer vblank_timer; bitbang_i2c_interface bbi2c; + I2CDDCState i2cddc; MemoryRegion linear_aper; MemoryRegion io; MemoryRegion mm; diff --git a/hw/display/ati.c b/hw/display/ati.c index 6cf243bcf95..9a7c5703b0f 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -28,7 +28,6 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "ui/console.h" -#include "hw/display/i2c-ddc.h" #include "trace.h" =20 #define ATI_DEBUG_HW_CURSOR 0 @@ -1039,6 +1038,7 @@ static void ati_vga_realize(PCIDevice *dev, Error **e= rrp) { ATIVGAState *s =3D ATI_VGA(dev); VGACommonState *vga =3D &s->vga; + I2CBus *i2cbus; uint64_t aper_size; =20 #ifndef CONFIG_PIXMAN @@ -1087,11 +1087,10 @@ static void ati_vga_realize(PCIDevice *dev, Error *= *errp) } =20 /* ddc, edid */ - I2CBus *i2cbus =3D i2c_init_bus(DEVICE(s), "ati-vga.ddc"); + i2cbus =3D i2c_init_bus(DEVICE(s), "ati-vga.ddc"); bitbang_i2c_init(&s->bbi2c, i2cbus); - I2CSlave *i2cddc =3D I2C_SLAVE(qdev_new(TYPE_I2CDDC)); - i2c_slave_set_address(i2cddc, 0x50); - qdev_realize_and_unref(DEVICE(i2cddc), BUS(i2cbus), &error_abort); + i2c_slave_set_address(I2C_SLAVE(&s->i2cddc), 0x50); + qdev_realize(DEVICE(&s->i2cddc), BUS(i2cbus), &error_abort); =20 /* mmio register space */ memory_region_init_io(&s->mm, OBJECT(s), &ati_mm_ops, s, @@ -1147,6 +1146,7 @@ static const Property ati_vga_properties[] =3D { DEFINE_PROP_BOOL("guest_hwcursor", ATIVGAState, cursor_guest_mode, fal= se), /* this is a debug option, prefer PROP_UINT over PROP_BIT for simplici= ty */ DEFINE_PROP_UINT8("x-pixman", ATIVGAState, use_pixman, DEFAULT_X_PIXMA= N), + DEFINE_EDID_PROPERTIES(ATIVGAState, i2cddc.edid_info), }; =20 static void ati_vga_class_init(ObjectClass *klass, const void *data) @@ -1169,6 +1169,9 @@ static void ati_vga_class_init(ObjectClass *klass, co= nst void *data) =20 static void ati_vga_init(Object *o) { + ATIVGAState *s =3D ATI_VGA(o); + + object_initialize_child(o, "edid", &s->i2cddc, TYPE_I2CDDC); object_property_set_description(o, "x-pixman", "Use pixman for: " "1: fill, 2: blit"); } --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009616; cv=none; d=zohomail.com; s=zohoarc; b=fnfvQs9BOe+Jcho5+TYpK5+ZUVV8SMWWARvw3sqQjpt2b9i4R+WfkYu3Q1dnsZsQ31NHRbOUFQmGUWMfHW6pn087fU9Br8+BtoMzcWYghxmMl9rRRud/oxom5BbEaSGlEom1bF9AwZi5zHzZuubV5riWQcxSCH/OsMr1F4ihFuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009616; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Dfw9CRxibqwr6dD4hxl72mLeiLdIqrv6wWNvcJ3zBlo=; b=Y/2/zD74ZH8KO5qS6N7l+WOrBXFRGYJXgTkmVZGbDzZPsMHRwFECjD3LYX8TJ4zlGw6m71togCv+9KPVyVDV/N+VU57PaHDNZV4VS8XfAFBgT23fMzvLl/z+y2R056yUr0j/jN4VC+4qFISVDgOHv1/ERLENfDGu9gFKFlHAUXc= 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 177300961626290.74153901427496; Sun, 8 Mar 2026 15:40:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMn3-0008Hq-Hb; Sun, 08 Mar 2026 18:40:01 -0400 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 1vzMmu-0007p3-8Q for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:53 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMms-0003nm-Dc for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:51 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-439bcec8613so5457625f8f.3 for ; Sun, 08 Mar 2026 15:39:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae49177sm21038760f8f.35.2026.03.08.15.39.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009589; x=1773614389; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Dfw9CRxibqwr6dD4hxl72mLeiLdIqrv6wWNvcJ3zBlo=; b=RiXKZZBPG1RGvwhtgzXDWRja5SaOgRj1vsZoljgIsy8Zk+kVajshzKuVU9mp2QxonL GBy23+7PjfigA1qCT0SZEmrm2y4jynAtN5ThC2bsFoHXH4StZOgTNGvrFb1j7SI7FzSt nSEutcF/DHD9rSRDS3ej3LFNHPcuX8sAPOvVG6zDqg5x7H0hUJXQYjMq3mwfUzZvEt53 XIneTTTqqZ50Hqonmhpt76+mRMvf/bJgw9pXAfQxor4JbHEVmLyMau3hWrUoB93L44hn xhuzcKe4BSuFufblsnddGU/Ub8HEdJwaCvGXEghp9W+hQ5HcigiCJjsdNJl04UDafXLu WoMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009589; x=1773614389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Dfw9CRxibqwr6dD4hxl72mLeiLdIqrv6wWNvcJ3zBlo=; b=c0JBYELhPqlNv3M/6YWNHQAxbeQhIZhRXN74pIl87iQbS7k78sUfvkLWhhQTHjCQa4 tX4sDMNjwOhFAJQztxPvn60rICNfnjomid2MVcULkmx1XekPWUM0eKk3/zckdVVu6ogE 4oRTPsKwGuWPu76yG72+LHIKrzglQRUqXahF/KL2OLZDjP6DgI/+FfPnnN0wQk48u4gW rrEe00qiNBtW2YsUFVeWYemUPjkkGkGguHNOAgllNIuUV29lmRwlhmvQeHJ5V0E29cKQ LEV4dGARF20JpMnw+wHbguDEdQMNLYqHZ1GssNwYwbL3hwdPENCaE4nl3Zy/ig+raoeW RjjQ== X-Gm-Message-State: AOJu0YwKQ7UFJYdBp3QgkvDfNWT+yLalqQkduJkPMCx5+0Bo4Oxt9fC7 mbQOxNFxnEIkAnHOU2oET6Tg5S6e7K/OvksS9DYa+s6uq5YKUQ0p3kEVlWfCatlsvKWvayCP7yH 0KEeH4kQ= X-Gm-Gg: ATEYQzxc+i5dyy+RqPRP28dYsqpSHczYbCslBBt2qCZC72IvP9ovsV8D4ylsg7IeEFK KyF0kLkcEPQVtGPcHvq4vl4t0Xc6PD//1ZHtAOoV7hNpubdYaYjAvGzCskANWVKygUkVdd4U/e0 cMZwi28qxzGonPPZu69LIafGXI3kQYTdq6CQ9vVlv6uEdoCcuIffB3jKxzkgeLkQS3Rgp4swwPQ dPEdqEHkh2UDnBl1nukCG5YFkYhlmlDAYQpyPrNr6RFD/wbM4XbYw7hmBziJyjX2U65RjtO3ryp uapHVOuc6nL6Gm92jroCjzgqTJdUXdfiVGpjR1awkkwTj/JXVqEke7GLN7aNbEbKfLUxH6lotsC R2KkvEzygwqLDKN4e7XfnscLfu+RRMYU/EDsRaKDqq/wbJzBN0u3hJEFtQeb/iiJUuEsdSO5LdX sdsYqfM7JLWi7VGbzUyoOIUP/rFipKpTzAYY9b2w1aDtycqHNHweqmVFHnN2pFU4tCMelQ0tFqE pkQb9kV+AQOB+jw X-Received: by 2002:a05:6000:2312:b0:439:c5cf:fc6d with SMTP id ffacd0b85a97d-439da348c64mr16592008f8f.4.1773009588566; Sun, 08 Mar 2026 15:39:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 46/49] hw/m68k/mcf_intc: Use qdev input gpios for input IRQs Date: Sun, 8 Mar 2026 23:34:30 +0100 Message-ID: <20260308223433.25503-47-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773009617852158500 From: Peter Maydell The m68k mcf_intc interrupt controller currently implements its inbound IRQ lines by calling qemu_allocate_irqs() in mcf_intc_init(). This results in leaks like this: Direct leak of 2944 byte(s) in 46 object(s) allocated from: #0 0x5cf95ec15323 in malloc (/home/pm215/qemu/build/san/qemu-system-m68= k+0xf9e323) (BuildId: 18d55ef8ea9856e68ee30802078af5050b8b06c5) #1 0x7637c65c5ac9 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62ac9) (BuildId: 116e142b9b52c8a4dfd403e759e71ab8f95d8bb3) #2 0x5cf95f6b2f27 in object_new_with_type /home/pm215/qemu/build/san/..= /../qom/object.c:767:15 #3 0x5cf95f6aa62e in qemu_allocate_irq /home/pm215/qemu/build/san/../..= /hw/core/irq.c:91:25 #4 0x5cf95f6aa62e in qemu_extend_irqs /home/pm215/qemu/build/san/../../= hw/core/irq.c:79:16 #5 0x5cf95f5f6d99 in mcf5208evb_init /home/pm215/qemu/build/san/../../h= w/m68k/mcf5208.c:310:11 This isn't an important leak, as it is memory we allocate once at QEMU startup and that has to stay live for the lifetime of the system. However it does point at a code improvement. Modernise this to have the device itself create inbound GPIOs with qdev_init_gpio_in() that the board can then refer to and wire up individually. As the device is used in only a single board, we can update device and board in a single patch rather than having to try to figure out some way to change the API more piecemeal. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260306190425.3047580-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/m68k/mcf.h | 5 ++--- hw/m68k/mcf5208.c | 24 +++++++++++------------- hw/m68k/mcf_intc.c | 8 +++----- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/include/hw/m68k/mcf.h b/include/hw/m68k/mcf.h index 5d9f876ffeb..b2a599adaad 100644 --- a/include/hw/m68k/mcf.h +++ b/include/hw/m68k/mcf.h @@ -14,9 +14,8 @@ DeviceState *mcf_uart_create(qemu_irq irq, Chardev *chr); DeviceState *mcf_uart_create_mmap(hwaddr base, qemu_irq irq, Chardev *chr); =20 /* mcf_intc.c */ -qemu_irq *mcf_intc_init(struct MemoryRegion *sysmem, - hwaddr base, - M68kCPU *cpu); +DeviceState *mcf_intc_init(struct MemoryRegion *sysmem, + hwaddr base, M68kCPU *cpu); =20 /* mcf5206.c */ #define TYPE_MCF5206_MBAR "mcf5206-mbar" diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index c6d1c5fae9f..0e07aa45e9d 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -227,7 +227,7 @@ static const MemoryRegionOps m5208_rcm_ops =3D { .endianness =3D DEVICE_BIG_ENDIAN, }; =20 -static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic, +static void mcf5208_sys_init(MemoryRegion *address_space, DeviceState *int= c, M68kCPU *cpu) { MemoryRegion *iomem =3D g_new(MemoryRegion, 1); @@ -250,11 +250,11 @@ static void mcf5208_sys_init(MemoryRegion *address_sp= ace, qemu_irq *pic, "m5208-timer", 0x00004000); memory_region_add_subregion(address_space, 0xfc080000 + 0x4000 * i, &s->iomem); - s->irq =3D pic[4 + i]; + s->irq =3D qdev_get_gpio_in(intc, 4 + i); } } =20 -static void mcf_fec_init(MemoryRegion *sysmem, hwaddr base, qemu_irq *irqs) +static void mcf_fec_init(MemoryRegion *sysmem, hwaddr base, DeviceState *i= ntc) { DeviceState *dev; SysBusDevice *s; @@ -268,7 +268,7 @@ static void mcf_fec_init(MemoryRegion *sysmem, hwaddr b= ase, qemu_irq *irqs) s =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(s, &error_fatal); for (i =3D 0; i < FEC_NUM_IRQ; i++) { - sysbus_connect_irq(s, i, irqs[i]); + sysbus_connect_irq(s, i, qdev_get_gpio_in(intc, i + 36)); } =20 memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(s, 0)= ); @@ -283,10 +283,10 @@ static void mcf5208evb_init(MachineState *machine) int kernel_size; uint64_t elf_entry; hwaddr entry; - qemu_irq *pic; MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *rom =3D g_new(MemoryRegion, 1); MemoryRegion *sram =3D g_new(MemoryRegion, 1); + DeviceState *intc; =20 cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; @@ -307,17 +307,15 @@ static void mcf5208evb_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x80000000, sram); =20 /* Internal peripherals. */ - pic =3D mcf_intc_init(address_space_mem, 0xfc048000, cpu); + intc =3D mcf_intc_init(address_space_mem, 0xfc048000, cpu); =20 - mcf_uart_create_mmap(0xfc060000, pic[26], serial_hd(0)); - mcf_uart_create_mmap(0xfc064000, pic[27], serial_hd(1)); - mcf_uart_create_mmap(0xfc068000, pic[28], serial_hd(2)); + mcf_uart_create_mmap(0xfc060000, qdev_get_gpio_in(intc, 26), serial_hd= (0)); + mcf_uart_create_mmap(0xfc064000, qdev_get_gpio_in(intc, 27), serial_hd= (1)); + mcf_uart_create_mmap(0xfc068000, qdev_get_gpio_in(intc, 28), serial_hd= (2)); =20 - mcf5208_sys_init(address_space_mem, pic, cpu); + mcf5208_sys_init(address_space_mem, intc, cpu); =20 - mcf_fec_init(address_space_mem, 0xfc030000, pic + 36); - - g_free(pic); + mcf_fec_init(address_space_mem, 0xfc030000, intc); =20 /* 0xfc000000 SCM. */ /* 0xfc004000 XBS. */ diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index 20112c94be1..1014fe6fa57 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -175,6 +175,7 @@ static void mcf_intc_instance_init(Object *obj) =20 memory_region_init_io(&s->iomem, obj, &mcf_intc_ops, s, "mcf", 0x100); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem); + qdev_init_gpio_in(DEVICE(s), mcf_intc_set_irq, 64); } =20 static const Property mcf_intc_properties[] =3D { @@ -206,9 +207,7 @@ static void mcf_intc_register_types(void) =20 type_init(mcf_intc_register_types) =20 -qemu_irq *mcf_intc_init(MemoryRegion *sysmem, - hwaddr base, - M68kCPU *cpu) +DeviceState *mcf_intc_init(MemoryRegion *sysmem, hwaddr base, M68kCPU *cpu) { DeviceState *dev; =20 @@ -218,6 +217,5 @@ qemu_irq *mcf_intc_init(MemoryRegion *sysmem, sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev)= , 0)); - - return qemu_allocate_irqs(mcf_intc_set_irq, dev, 64); + return dev; } --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009608; cv=none; d=zohomail.com; s=zohoarc; b=WGs7L8DsbclYvU61PtNc8p5EtL3i/NjMojh3dZOW/VOODFr3SZMNpmdaV82w1XcWSLIdyp3FS50nAWpbTlqKxgCEW/mIVcusd+fkqRcVM1P/Ho+BtJje/Dwh0ITVvXt/l2JqWyXAV4H9XZ+t3XnJliSeX98yEKSFLzrbPibd/IE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009608; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=+6XuEcNraxH7BH41Yk9P7HZEnHj+sBykaCOA3JVPxYc=; b=YeZO1V6G0axFao8HP7BqF/WgEiAuy5sMBlJ9kNb5zuEFaZHxG6jZYAekTcz3LhnMnxe+ZawlxdC193jmHYcZ1dtST2hAVIyBOuNNrhOt3XTKOAu4zqM4OQANJienm/pQ19qXzTAqD5M1ZpeX6MmGG5RSRe5hBqpupAlpMSVboSo= 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 1773009608645170.8316145479031; Sun, 8 Mar 2026 15:40:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMn4-0008P6-CL; Sun, 08 Mar 2026 18:40:02 -0400 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 1vzMn1-0007yb-A3 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:59 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMmz-0003of-RR for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:39:59 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-48538c5956bso5627075e9.0 for ; Sun, 08 Mar 2026 15:39:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853438017bsm139026065e9.0.2026.03.08.15.39.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009595; x=1773614395; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+6XuEcNraxH7BH41Yk9P7HZEnHj+sBykaCOA3JVPxYc=; b=i968ZE+b7WGRDEThnNOwDgvJMiztYuXKznp+jibHGtYUDPR2bPXcQTtfvztkn4D1ez jlDzv2GaB8J4bDzPpucDkT+XouTg/izjBFaOB+RkrgW4/H7EORwDxkFG8yDt7Q29K4M0 8Cp98x5s++PuwqxhxK8+vkIN0YX2w7+pZkhMoWGc5jEVEfyJIZQrBMo4P/as0BBHm0Fe o/KmUwZBdDfa6/NeuoeouBDzJhD7TlIhk/9c5KWtT25GXjhGjIRetretXMF0v0GztvBA G73sE5kFwGa9jgvkuJAANRabm8o4fWoqQeHIMQ2HXcecWciCUXiz2mJqzZT4j8vZob7J czDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009595; x=1773614395; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+6XuEcNraxH7BH41Yk9P7HZEnHj+sBykaCOA3JVPxYc=; b=gu5xgfGzB2u1fa4INfeiD3S5kssfTrJAiKprW1CianeUqtWAIyuuoP49cw8EiLtnr/ ve8y4NmoXm9apOmOnnmSoEx+2kYIlUD9/C1q2UwzZiUessatWscS9+zp0KUWvvxU/0Y2 KbSzx7IRyz8WkF+NI9er1Qaee0QCwq7mpz8v0QyUqHJ+WnyyLkBDYfZZKFfUjonLfGwA EaLaK423sjryx6q3MiwyFku25OfFWXNG9AhSmF8faKcazcz2enhw7svKQ4xiX3X18hFT aIvIzNUgW18uoGNK963tTALBnC1NyThCDXa/uBZ7M33SujUjPuDg903r4/i4PsOct/B/ fQzw== X-Gm-Message-State: AOJu0YywzwnicukdbMTPIINx7exsLPNMRBZ6nnbqjBvy/aiW9UWy9HF3 3LNMjQNA70vqNxGpXxhef9aziehUw0cMKdP3CuirCIvURDiYpQDP4a+qwsggfihYOB8L2v+afuZ ZMxt57bc= X-Gm-Gg: ATEYQzz+JO1MW9d+ockFJ2k+Sif5CvsomD6CROJMJNW4q3wQumSzgxifLL3tGxYUIDA 0ADLXhA9Fh/02NtJe6jXJYDpzUC1p3c5JNmHdDivIEYl/3RhqvbMlE4ET1nnPDPgPScibL+AJf2 0pPBGt4T+MeKJpKrDN01UaGWOz0rKQBY/srW0IgzR/NDIYKQpzxzaq7vGJPqKevYbOmM7HkhCdf cSuL/R0G8MTD8tOBQ6eGtKWREDgi9Xxmj0448KkFJGVOuGPtp6qtDiWXiB98qmqbfH6+NSmbAmt lFpUOp05uyffRrmBhGpf1aum5EFbERdqBJIA4OXR2HLMVSb8w321QrfuJe9ky4z27KZLnbWTinp KIH4xY5WukQbCjR3pZ6s9PtaNOyKQulE/umc2JzkGYGnfx8E9sfMMVikVaF35WGd/Pet3uGZMWB Emh27niKbhex0r1j+EjViGtLzHUQoW2r0vuTtqgSPKgKfeyu7sbQ/Yy6D/bnk6/H80RusOGbyju DMBI8RjRBD/smX+ X-Received: by 2002:a05:600c:8b2b:b0:477:9890:9ab8 with SMTP id 5b1f17b1804b1-48526715213mr136501055e9.3.1773009595151; Sun, 08 Mar 2026 15:39:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 47/49] audio/jack: Fix use of qemu_thread_set_name() on macOS Date: Sun, 8 Mar 2026 23:34:31 +0100 Message-ID: <20260308223433.25503-48-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 1773009610982154100 Since commit 8f68a33ad46 we get on macOS: Audio backends CoreAudio support : YES PipeWire support : NO JACK support : YES 1.9.22 ../audio/jackaudio.c:654:12: error: unused function 'qjack_thread_creator= ' [-Werror,-Wunused-function] 654 | static int qjack_thread_creator(jack_native_thread_t *thread, | ^~~~~~~~~~~~~~~~~~~~ This is simply due to a missing #ifdef'ry change. Update so we can use the new qemu_thread_set_name() exposed by commit 46255cc2be9. Fixes: 8f68a33ad46 ("audio: make jackaudio use qemu_thread_set_name") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Christian Schoenebeck Message-Id: <20260307114923.75394-1-philmd@linaro.org> --- audio/jackaudio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/jackaudio.c b/audio/jackaudio.c index be6fb378f72..589aecede9a 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -712,7 +712,7 @@ static const TypeInfo audio_types[] =3D { static void __attribute__((__constructor__)) audio_jack_init(void) { qemu_mutex_init(&qjack_shutdown_lock); -#if !defined(WIN32) && defined(CONFIG_PTHREAD_SETNAME_NP_W_TID) +#if !defined(WIN32) jack_set_thread_creator(qjack_thread_creator); #endif jack_set_error_function(qjack_error); --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009611; cv=none; d=zohomail.com; s=zohoarc; b=l8DARNNe/mBOOskjc29sFLz6bSz5fAUTsloofVFPCb0ldy22+L2SQts4mDyK86OP7RDCNwZZ0Vsu7Z73nX6I061EXwVcdtAC5eKB4bRUSCbwTYaXQuzRszk1n4swb10Uy7/pI0goONqddvo3cwaT1XuQ/slnaO9mw2hd/p9FcWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009611; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=8DwSG/tB/iXvNNLgKPuBzabsRMX6X8tCIczGBV0fYKM=; b=Nwph7vQOS8nNySdt7SV6z+VA64gQU/68aKAVO+1X2YGccpomB3sGRv6WqnRx6CN6mU3OHhfPwGoqHi5EqhJKnOZJpbaGcL09gygHkXZK1N77R4k8lLIITx19+t7jRL/sze41UjUOFFBpjNt5RFHAnc76zReVWWj/bqJ2ntfQ+K4= 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 177300961124319.698314483145055; Sun, 8 Mar 2026 15:40:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMn8-0000Uc-Gk; Sun, 08 Mar 2026 18:40:06 -0400 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 1vzMn7-0000QD-GO for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:40:05 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzMn5-0003pU-Mk for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:40:05 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4837f27cf2dso102169915e9.2 for ; Sun, 08 Mar 2026 15:40:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae483desm19937614f8f.34.2026.03.08.15.40.00 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009602; x=1773614402; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8DwSG/tB/iXvNNLgKPuBzabsRMX6X8tCIczGBV0fYKM=; b=XM32t1Ooqh9qfty3JO9aQi6pifT1dmjnxvnUpXcsHNhcZF/O9nYvs++njfpS4KXQAh O9b/fHWFIBks70uiqjgh2tn8FgabpxcRH+frTLDaIJii20xik3HME3g64yuf7ipiUd+j u8sotr9tls3Y82fhNBRAyI9QgRjY6QbDZ8SSLsBUI9XS+C5PU38653t5JcKKkmvl08h4 LYZdZBIW/ajUo/5Ovnau1IiK4yYYdZHvmbcFhEsQaRKE7d04oUmtJrp/Upl7qfE82V2u ZdFjtay3W7+EfzBtldsQgeqY9MgKpEtl8X2AFKJjHXsI31oFNAM8mNjAsXM2A3ohxN4Q Czlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009602; x=1773614402; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8DwSG/tB/iXvNNLgKPuBzabsRMX6X8tCIczGBV0fYKM=; b=i5zYEPIWzzS9rIfALNf7oOjGfUY/k99j81XXTpeOdx25tF7z2xS5Qp63IzmdT72eUo oab0YdlJ8hBrZS+RzdHJUSpZxo9ZurIpGjWNB3KnL85blXA3hfCPY0NQPHti6/bWw1dk s/92UUD2u2TNnWUZrdiaFYaNwBLaS8ApxpTBxvxhUesmDu0Z5cYSMGJKbtMzJQnw5nsU gm8GD31qaN+aZLffYj6FIziipdxGu13TSnikWhrrcrrGPCiDMumWHMc7lO4w1VGC6r/s Ulsn/7mZ6+XJRtOlCavg9xjgKC+X3v1qY0eJppSo0MYVKwS1GDJ/3yIFkE/eEBE68KN3 XRgQ== X-Gm-Message-State: AOJu0YxMFwbiaZa33opwvikp2lem3rHc+YoDIXZeHPvkpCtnJmbGR4Eh Lt5hZrRIHWDdG8u6qjxUEqiio1rLMmV/iNHKfzpCOYKiz8NgF76SkYrti5Q99dcDLWJQh2Ct1pg leSA3wWY= X-Gm-Gg: ATEYQzyvC+8jCjsJ7965Rj5wDkfIUHsGBrkZ7H4vNAwlMNE6Cj0sf3J0RLuQonh/9Cg UUDZJKwhA2LWbcjmRkbEmEb1c7oNGz3sObMS5EcNTlrvxyiNHyrDMsHVOdAkJi9OB2cAX2ygG9R 4rJwu8++gpFnigPqaYbkxlur2TMHU8juxPNkVtaWvHq4qHmF8M8hczDpqEbU36GOexPXPiLWzoU rQnIhCKufXgKiueDNXhJiLHeM8Ra7qrNBdiX7cqzzd+mqNv61/8cc/3v9mEtK5ksbwYknfPGbHi XQxs/TMt+xiU8tS9CVVSKgTM1Et5tE+rZefNrBKe36jhAaDAlnB1MNWVjN2J3DG4b6iqKfVN8Oa ovIJ8snsmxGfo5Cxkcj+3Hc02VF3mJhDNd2zGsQSOr4fX2lCgnqIGZxGlES6TIgq0s9emVhQl7p NmLmMom5pcy8/5bHFwJv8Y136RwTZxOsqhmMBERhxGHgbCgKdmuJSqNKt/WW7xYgMrnuR5YZMAp YUATQ== X-Received: by 2002:a05:600c:5288:b0:485:3af5:7e53 with SMTP id 5b1f17b1804b1-4853af58154mr29535285e9.19.1773009601840; Sun, 08 Mar 2026 15:40:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 48/49] hw/hppa: Avoid leaking a diva-gsp device Date: Sun, 8 Mar 2026 23:34:32 +0100 Message-ID: <20260308223433.25503-49-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 1773009611746158500 From: Helge Deller Create a Diva-gsp unconditionally on all 64-bit PCI machines. The A400 usually comes with a Diva card. The C3700 has a built-in SUPERIO chip, which we haven't implemented yet, so running with an emulated Diva is the best we can do for now. Signed-off-by: Helge Deller Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Message-ID: <20260307195243.8813-2-deller@kernel.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/hppa/machine.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 6b69a304c2a..ec63dc12979 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -382,18 +382,15 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus, =20 if (pci_bus && hppa_is_pa20(&cpu[0]->env)) { /* BMC board: HP Diva GSP PCI card */ - dev =3D qdev_new("diva-gsp"); - if (dev && !object_property_get_bool(OBJECT(dev), "disable", NULL)= ) { - pci_dev =3D pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp"); - if (!lasi_dev) { - /* bind default keyboard/serial to Diva card */ - qdev_prop_set_chr(DEVICE(pci_dev), "chardev1", serial_hd(0= )); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev2", serial_hd(1= )); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev3", serial_hd(2= )); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev4", serial_hd(3= )); - } - pci_realize_and_unref(pci_dev, pci_bus, &error_fatal); + pci_dev =3D pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp"); + if (!lasi_dev) { + /* bind default keyboard/serial to Diva card */ + qdev_prop_set_chr(DEVICE(pci_dev), "chardev1", serial_hd(0)); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev2", serial_hd(1)); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev3", serial_hd(2)); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev4", serial_hd(3)); } + pci_realize_and_unref(pci_dev, pci_bus, &error_fatal); } =20 /* create USB OHCI controller for USB keyboard & mouse on Astro machin= es */ --=20 2.53.0 From nobody Sat Apr 11 21:30:46 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=1773009626; cv=none; d=zohomail.com; s=zohoarc; b=CDsQwj5c0NNc/a2W9eC0yIeCSZauawuHRqH+e4so078m7ADlgXD+020YYtMUS2ehLscJn1vyUe/xiz+yRhXPMDOZQXUjrd4EYt2lVrYjmgaWsZ5ehOgySxvw7n7nG2oETtYKtgOR7VGe60QmCCgratdqdCPMyRT7ncNnKyEyfp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773009626; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Vi22zdaCk2LuAhPhd6uA58Ohth+YuI+ifJV1zGOLiuk=; b=b6Ye9DcM+eOInp49O5nGWWiZhW35CKQkvg89xsfp9VDySbVMYKLt330bsvHrPmgl5RNfBum1UvxC+I0yfleCb7/uDxtBDQAvmnT3MqPXdddyEgDoGpGOgfTqPpvxtVYsjxBnnz+3SdOksUpfXDu6e0JZIrQAhA6ZBDPN+21YphI= 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 1773009626125683.5119591884937; Sun, 8 Mar 2026 15:40:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzMnG-00015M-89; Sun, 08 Mar 2026 18:40:14 -0400 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 1vzMnF-00013N-12 for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:40:13 -0400 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 1vzMnD-00042V-0y for qemu-devel@nongnu.org; Sun, 08 Mar 2026 18:40:12 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-439c56e822eso5450723f8f.2 for ; Sun, 08 Mar 2026 15:40:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae36785sm19858880f8f.27.2026.03.08.15.40.07 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Mar 2026 15:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773009609; x=1773614409; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Vi22zdaCk2LuAhPhd6uA58Ohth+YuI+ifJV1zGOLiuk=; b=vHO20rK7Yu18qr33qERLJmQinTkmf58jqAbfvBr/2hlg5fuekXG/n5gL0SQgG9qsA3 8GnmeKaKr6WS85l4ft80ohlHP/rhaREHrXO7exExANF5rlz3K8HoQryJUFvHW7UhtSsM TIpo1RYrJvzHvTCnheNA8lXbC+7KHfO6yJayqjKrg81dBFO29V37Mpw4SvfkO15wT+Cy vqAYqhck43O18GTqOEV4T51YJxFV/+jUn/G224bIZGuGgzLFjP6IMWxx9S9YnurkWjcm 7lRFCFgzLY4ChrdA6tbaK5uncEAwgUQb7vcOd8gS5L6nHS0LbwPXlzUk12o4jo2nDWYu NUCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773009609; x=1773614409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Vi22zdaCk2LuAhPhd6uA58Ohth+YuI+ifJV1zGOLiuk=; b=wNAwmSyPwZ+ybkYCKMk4jzwGUB/88bJ8POUPPATLO2Hk8oNK+Z6r/ymjKq+Xj/0dxr IVuM/oAV30BkjzLu6A/XvT+/EMmp8NR0VYHmGpWeLf4gaJYwyU0mNf/Fi0KV69ekIkL+ paf61zYjmYDUrVav/TrFvMR1KyzhWWC9smTOpQFElvuY9pFMdAHQ77CAcYcAYaFy5JEA Uhq/610Mklmf66tWxTZC49YSzogBFWvlQlG+uHU62QrLfDLsAGHqvqOCrmdrYwzYdo0V mceQTixuRDrXw2noJgrbmStASIvZHXyclvNVxe0VPXZcgcIo9pKhKE0oEOYshaK0CR83 CzDg== X-Gm-Message-State: AOJu0YyS51uI05lqv37Z9VU/EUxTo98+QjXLEIo/K+PabdwPJ9DtSIlj BXXkuSTZU/VFMDhhw8fZrXl3BC+TOHl2I2M0tdhHVIY+5MKy46JsWSsQvHXZG7gZ/+qObbUz+6r ecg4EMjk= X-Gm-Gg: ATEYQzzJJvyYTxyq10hhqOHHNeHniqB/L45T7dTs0p3atbTZV70IG5iaDsbqPnLPOdm NFNBLmTvmwXmp9Lx3sZroXSRH+jGCapwxqvSUVkIzNrHd0DPSHar+FrSYCk2g470XDK6JiLegjl X+XMsZWfkptDzZHh8cZ85eJblQAprMG8p5+fhCgyZL/UUGPfm3sTrNGFVj6VlZeaBYEStJI3DOt PWzssTrjv29uPrrzQAL+ieyDRIveOoB7/BrxdtRFlJQ8uJJTYwAGWmL9rgD0urCGDT6pMxBF+L+ b0QfESFemavA3InuJ4L0YndLj/wWVGRJRK+iEiuhEICAkOWnlbzOihiCVS2Y7E37u17E5zgli9B Upy7LUGkMzP963DaypaGdIg3S+7YIuRMMtdcso2f1norktrrKJimp0KqhUKTLZwa7uJoTftqax9 V8/pX0Ff6TqA2kPZ/cxbsRVlvjIN6TrTkpTjIVmxqn+3BuTtGIsTSK1o47EXylB3W7LI6daHiO+ fTUsQ== X-Received: by 2002:a05:6000:3113:b0:439:ba75:7db7 with SMTP id ffacd0b85a97d-439da555428mr15016841f8f.7.1773009609197; Sun, 08 Mar 2026 15:40:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 49/49] hw/char: Drop disable property of Diva GSP card Date: Sun, 8 Mar 2026 23:34:33 +0100 Message-ID: <20260308223433.25503-50-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260308223433.25503-1-philmd@linaro.org> References: <20260308223433.25503-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=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: 1773009627176154100 From: Helge Deller The "disable" property is not used, so drop it. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Helge Deller Message-ID: <20260307195243.8813-3-deller@kernel.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/diva-gsp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c index f9aa6e326d6..53fd0fe2a13 100644 --- a/hw/char/diva-gsp.c +++ b/hw/char/diva-gsp.c @@ -51,7 +51,6 @@ typedef struct PCIDivaSerialState { SerialState state[PCI_SERIAL_MAX_PORTS]; uint32_t level[PCI_SERIAL_MAX_PORTS]; qemu_irq *irqs; - bool disable; } PCIDivaSerialState; =20 static void diva_pci_exit(PCIDevice *dev) @@ -159,20 +158,18 @@ static void diva_pci_realize(PCIDevice *dev, Error **= errp) =20 static const VMStateDescription vmstate_pci_diva =3D { .name =3D "pci-diva-serial", - .version_id =3D 1, - .minimum_version_id =3D 1, + .version_id =3D 2, + .minimum_version_id =3D 2, .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PCIDivaSerialState), VMSTATE_STRUCT_ARRAY(state, PCIDivaSerialState, PCI_SERIAL_MAX_POR= TS, 0, vmstate_serial, SerialState), VMSTATE_UINT32_ARRAY(level, PCIDivaSerialState, PCI_SERIAL_MAX_POR= TS), - VMSTATE_BOOL(disable, PCIDivaSerialState), VMSTATE_END_OF_LIST() } }; =20 static const Property diva_serial_properties[] =3D { - DEFINE_PROP_BOOL("disable", PCIDivaSerialState, disable, false), DEFINE_PROP_CHR("chardev1", PCIDivaSerialState, state[0].chr), DEFINE_PROP_CHR("chardev2", PCIDivaSerialState, state[1].chr), DEFINE_PROP_CHR("chardev3", PCIDivaSerialState, state[2].chr), --=20 2.53.0