From patchwork Tue May 13 17:39:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889625 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233616wrr; Tue, 13 May 2025 10:49:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUA72/9BIlsSCuLiFRuSlBsE+F5qeGajs5l35G54O89x/bZEa0Mr9/YZswFVc9LUGvI7Pbb1g==@linaro.org X-Google-Smtp-Source: AGHT+IGksoIxM757Uwz1htTfG6+6PKKZYXR4hdBvWywGtBhO0dsOtrilPFB+YlwRFS03IUmQFFVF X-Received: by 2002:a05:6214:ca6:b0:6f8:8df1:649 with SMTP id 6a1803df08f44-6f896e26578mr6212686d6.7.1747158544667; Tue, 13 May 2025 10:49:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158544; cv=none; d=google.com; s=arc-20240605; b=ibw/9gtk6+99jp23Afu2utrNbcBfjLLJp9M/eboUAjwVT+9XGSEQD7MjzpoDUkSx+q yXe850+WgfsrDpzkxB+weONZ6soQptSJMN1D25177CjqM95L4JTIrNl1U4mjXf3w9F0k 7GvQ410aZkVsFQVIIjSh/wKq+8eqAhffFR+pPgFGyxZRaNNAtKZjXbWFvUj/m5onC1Yq cuRlx9UFDC3urmGIDBOBBym/ky9UxgFhJj9LeZEno+nIbvafkk+8vOKs0OH8aJkCpxDC b58y9WQBHQbbsdkQxKvmNTvi1cRJPVEgLxkSJ5C10pI64j7eSKQeFoxknPpITPax8qRi EFSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P790GYrQJv0XpWOMoTqY2JnOtiqfx1x49LfX4aa1ATQ=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=BKn2q9iGAP3DoHbyvF1cHQUgjsNukVnuINqgXlbHwG2q7fhT7pFK+QqaEa96H7pdcS Kp9CNb6jf1V95XMoXMR49zPAdPUeFZJnshA1iut2FghICTICmBOdS3xUsfrYxclEsY7e S6L9TDxcUPW0N4zQGtXFUU3l7PxI5pqFzv2MLtjBnSYuW80dUDtFLSNxzT+/ma0XoaCw InLn0ejR9HVgN2faeXPGQbfW6x7vZBgb2J+g8osAjjuRktsP6Gu0mrmgaqeay2rv4N3W kExqHO7NydRjml67xAcmTCnE998i65W1LBU530MZ9RyPQbkf1E92FBYLNR+WpqH2dIRr 2FKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qB1mZ8Vf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a4274esi120858716d6.205.2025.05.13.10.49.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:49:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qB1mZ8Vf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtk8-00017K-58; Tue, 13 May 2025 13:48:40 -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 1uEtbP-00084A-Ts for qemu-devel@nongnu.org; Tue, 13 May 2025 13:39:42 -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 1uEtbN-00037F-9G for qemu-devel@nongnu.org; Tue, 13 May 2025 13:39:38 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-441ab63a415so61566255e9.3 for ; Tue, 13 May 2025 10:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747157975; x=1747762775; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P790GYrQJv0XpWOMoTqY2JnOtiqfx1x49LfX4aa1ATQ=; b=qB1mZ8Vff66cIOudrdueggv4Cld9RwQ+w0Srpfd1F4rn9UdTMpzexomU7Rh6hL5Agy kDPTLEx43rtfP0l8w5HS5gHhHKgMJISeNuFObjhR6B1Txw2iruugBcXUkXpyAih0wEeM tZvnTz9BGbhkFLozlTxZ9bFSNUyfbJeS/1hflHY86XqeEJ08134f6bjIJbM2N9yKXd0P +jAyn0Fbvq9uw/YbUHLn+rT+mBrrVKvqb8MI3wv448cPcqc7DWdFcwfZkFrds9NYw8/m 8aHZpRBQ7m17za/W0ZXecxR2v/ihO0IVFNCAWjJqch2Vt6tm3DKjh1yCxP2HFBfh1GhY 9miA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747157975; x=1747762775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P790GYrQJv0XpWOMoTqY2JnOtiqfx1x49LfX4aa1ATQ=; b=YPL3AOCfQ+aR5heNSo41Bt66AFKCXLs2aHJSj/w4xht8KzajhIYKULvNi/EbqFcYv8 qbALxMJ0eIM7nG5XrImlUaeu6wkdZB3HC8qoUEJG+DcmWqmuzGP0p+RQK7JCXgJTi0yW /JA6htN95KEULJiPY08SQBi17jd917jInFXoFTIPgjoqOLBGaPIFcQqrovtd96TMMhnO gzn4PHKeO5CoPP28GvVmMRo2/g5S7iZ5lEEuVKjEv9bbR7vKnSnMIqgojEaFV0sPyG7P +YdyVZg7DwUFkVU+OO4O0wlbodC/ZPnKkt1zce2morfK62B/GMpjiIBwpIvwFY1nYNht P3Rg== X-Gm-Message-State: AOJu0YyM+JkfxZ51w6iQpr7x3pVUCH8pUZJUr3aAtqRumgOalxYDktLN Oz1/Cf7yDLpenA1cmbr7s+jL61d/aATeuj4Do5EPuY4E+qejCEHZi3gARC6aQC/TqwJ/T1GPVPm C1bY= X-Gm-Gg: ASbGnctpapMUKTgtUvpLkX8xAUv8nl9Y3uQAHcW1VKIBdbiRINNOXmTVnoRO/aQ7WM8 a2ve6Tves1Hk+51pyxDahBcbeVTT/YXH0csuGoXasXiwQ9dvGGBNjCAdnhBNJ9D3NzkznQEHQQW 6G/O1LfIMqyj7Lu3Fd8y4G6DWhVbRhzcxyQDrkyUAQIQADlloWKhqhe3UvabQIj5GCDt7K6i9yC X3NO5OyvOmojOSQ60CFpH/w0rF0XQGVafM+dp/Vkzrw73w1BmIpupbtzMmwKYZVG6olB4eSHEaD LPsP0WQ/RJra4l9MJVdo4nDxkRbatLEiDHyXZv5SeipZ6AGqbAOMbQUua9UwktyUPvw/iXuQIdw PFEjm1DMOItLk557Uw/ktGOIwFX8h X-Received: by 2002:a05:600c:1c19:b0:43d:412e:8a81 with SMTP id 5b1f17b1804b1-442f217986dmr1181665e9.28.1747157975324; Tue, 13 May 2025 10:39:35 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d687adc0sm173416585e9.35.2025.05.13.10.39.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:39:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 01/19] target/arm/tcg-stubs: compile file once (system) Date: Tue, 13 May 2025 18:39:10 +0100 Message-ID: <20250513173928.77376-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index b404fa54863..e568dfb706a 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -48,7 +48,7 @@ subdir('hvf') if 'CONFIG_TCG' in config_all_accel subdir('tcg') else - arm_ss.add(files('tcg-stubs.c')) + arm_common_system_ss.add(files('tcg-stubs.c')) endif target_arch += {'arm': arm_ss} From patchwork Tue May 13 17:39:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889620 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2232395wrr; Tue, 13 May 2025 10:46:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJbbuQAB9iFFJDh29hLIVpIWLECAqNZIZ3kJQXFeh6P42d7iYidHWQOLjrjeSghukE6qj4IQ==@linaro.org X-Google-Smtp-Source: AGHT+IEkXhThqpu3f4bDg4SrLUP92Yp53fYDQ/ZV4c74bYCMSCbkfqtgaepZZ+/nf9tvo5KvdL4b X-Received: by 2002:a05:622a:1b14:b0:494:95ad:2c07 with SMTP id d75a77b69052e-49495d1fd21mr4761851cf.40.1747158377197; Tue, 13 May 2025 10:46:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158377; cv=none; d=google.com; s=arc-20240605; b=IxVt1It1Po+nm0xupW2mGWAvzfjYlrF+w+15Pf6Qrh2jrjhBfaM9hSDQ2hbKEk/z0m 1boEjmqPDPeAnOVrX8lOPYWBfn23MFxR65htJYkkzDIMQPocL9FvYW08T7CMDKzgBUla /dVJ1ybEL8dQf5CRKCCVMmgpQG4TIjcF8Uet5VTXTlPNc2hrTKE6voSgleT+Db9Qa/Qe YnLYAIM45wDzo6GvCUfbwnMcc3lG1QlWp9iAO9HjkzrwuFiqN9pjgVf9sZKE/SkC0I1R YKOJiGfA5tvzklLQFeePRgXw2CA4X6P6TLuToATgErpPw6hAZ1bi8z1q5W3yGHIlxTFB lywg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mls/xaRakChhSn59tI4YzwbCahfEzZs0aBlZvGQ3N1E=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=D6sQ7DvLzfPryNvu8mKzKZu7r1awKppUa+pPdzu+TpY/S7O1+Id1bYOFzEYAI88W0H iMfpCyJx3nnZbjeLbpuBRBKrBwpywdTNZn5ejNF/uDBAM7Cg1Rmd8gDOvU0Pwh9rJJo/ Ud+F9sbnrkdacMFdbGMzeBptrkzwWJa5YbpI7xl9MjvWS/DePhVY/MYQqdcQmBoI9QkQ mKQSHdYLhIBRWeE3YPDbw9+oGDIvBIgAoZklalFxPYSMnsZxYapeuDbVq1pE/DIcChHr sDuSnLSKIjro8wb/s3kzIINIxJtB901+e8ysdMg+0KmBj4CloigmzmKId8HKvbHEqAes 8rOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lr4UIpBf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00f67fb8si1097132785a.161.2025.05.13.10.46.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:46:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lr4UIpBf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtfo-0003KX-90; Tue, 13 May 2025 13:44: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 1uEtbV-00088d-H5 for qemu-devel@nongnu.org; Tue, 13 May 2025 13:39:46 -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 1uEtbS-00038B-Nm for qemu-devel@nongnu.org; Tue, 13 May 2025 13:39:44 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43ede096d73so41382405e9.2 for ; Tue, 13 May 2025 10:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747157981; x=1747762781; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mls/xaRakChhSn59tI4YzwbCahfEzZs0aBlZvGQ3N1E=; b=Lr4UIpBfcoSGYEy/IuAM349MHuzZMPtzraAaZ6CgNADoKHDhcovPQst9vKJ91Jf9sf c+xFNyfnJ0BWSQz18XoWykgOJjs2ej+Lho5bw+tYiNmebm4HXIJZgpHeEBIbLyFXSct/ W8vGGxXL9jpC17+p4JS0ezqRzUWXemPpsMQCn02cStEi82lBJelWyjQwXcRzOqBt0kc0 HUiIZ1/iERJ4l9tIJqvYzNP5o3PQ3DkAxikIveR0e8vFBWoV49jEUZKbr+7229mg10+S PppF1zigb4fo0ppNPxrN1PhlW4rpUPuXSLCukZRUJdWbAgQ4tR0KhqywyrdotL18df5F Fouw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747157981; x=1747762781; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mls/xaRakChhSn59tI4YzwbCahfEzZs0aBlZvGQ3N1E=; b=JVbvIVMLUP7XJWT3lNJvIeVkNzzEKY5CydzlH9ApO4vaVPA8UQu5xSjF9mhLZr/ttG ZsqERzlXxKq/wiisruxYKNQwH0Mgzt5Eyv5C19221hvqYN1QCO50VfL2caX350yLRDur 6ElboMw5LyFwHLLHw/oBewbRG+X8UwYJJ2GYU0j2aVeFAYCr5C5oQuzzO1+q2Y2IgbSf 7lDjgXRJdqCzNkcZHAQHr+CKIZmrPqi0V/oYHrush5+cEDEvIAuW3E+WfrHaSJ1yS9cH UBHPFmm17AZJfEAoWnumzDukZ+bMX5GpZlu1pGKwvXOXV0dBrRSqDmfCOFqiricvCnvS xl6g== X-Gm-Message-State: AOJu0Yz6NQNhaLnqwkhPyQ54vq7mRGEIxyt4Nc79IzZ85G1Zfnwa9V+u BVMvZPJJSc8y2PUgwpKLb3KKxZG+ORy9i5qQdycmH5hRlZjnQ6nM8QiqY0Ky4Mteh5X8C/+rffF loNU= X-Gm-Gg: ASbGnctv+CozIOKvqXwG5F8BGQ5+FjYWJPlK6RFR9EV8syQbwkNhH5VkXEJqloqos4Q 6IPYSrqL/qFU521Z91uqRJD88ZGEO3J2HS96tE3ZyJcZGZ7oklmmyHXIcZB6ptJzpa7yY1JkEga 41kEHEMGryN4DGmWGJCMxbFlRFweQeTtwPWsSRPa4o8ECP1te4l4DKFi6FqNqfArOYfWP+OvqFf jf/fdqMRTfqAu99V1YxBGImeeTSEyzRaYwNgB9EZaIB3/XLL8nHL+d+O8eSVQoe9z+iTvTv8eAh XRQMgr+ZtNPBt01h4JdQUBDSvnbw7dX3NHwJZvuiBM5Ll2wsXyWpExAFUkCDRDvgjv5EOl2Oso/ kNYz9s5u472BluBr2fL/6Kx4zTWyg X-Received: by 2002:a05:600c:35ca:b0:43d:abd:ad1c with SMTP id 5b1f17b1804b1-442f20b94f5mr2043955e9.6.1747157980897; Tue, 13 May 2025 10:39:40 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d67ed1bcsm173195565e9.18.2025.05.13.10.39.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:39:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 02/19] target/arm/hvf_arm: Avoid using poisoned CONFIG_HVF definition Date: Tue, 13 May 2025 18:39:11 +0100 Message-ID: <20250513173928.77376-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In order to allow non-target specific code to include "hvf_arm.h", define the stubs in hvf-stub.c. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- MAINTAINERS | 1 + target/arm/hvf_arm.h | 16 ---------------- target/arm/hvf-stub.c | 20 ++++++++++++++++++++ target/arm/meson.build | 1 + 4 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 target/arm/hvf-stub.c diff --git a/MAINTAINERS b/MAINTAINERS index 6dacd6d004d..7431f88b5d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -509,6 +509,7 @@ Apple Silicon HVF CPUs M: Alexander Graf S: Maintained F: target/arm/hvf/ +F: target/arm/hvf-stub.c X86 HVF CPUs M: Cameron Esfahani diff --git a/target/arm/hvf_arm.h b/target/arm/hvf_arm.h index 26c717b3826..7a44e092620 100644 --- a/target/arm/hvf_arm.h +++ b/target/arm/hvf_arm.h @@ -22,23 +22,7 @@ void hvf_arm_init_debug(void); void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu); -#ifdef CONFIG_HVF - uint32_t hvf_arm_get_default_ipa_bit_size(void); uint32_t hvf_arm_get_max_ipa_bit_size(void); -#else - -static inline uint32_t hvf_arm_get_default_ipa_bit_size(void) -{ - return 0; -} - -static inline uint32_t hvf_arm_get_max_ipa_bit_size(void) -{ - return 0; -} - -#endif - #endif diff --git a/target/arm/hvf-stub.c b/target/arm/hvf-stub.c new file mode 100644 index 00000000000..ff137267a03 --- /dev/null +++ b/target/arm/hvf-stub.c @@ -0,0 +1,20 @@ +/* + * QEMU Hypervisor.framework (HVF) stubs for ARM + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hvf_arm.h" + +uint32_t hvf_arm_get_default_ipa_bit_size(void) +{ + g_assert_not_reached(); +} + +uint32_t hvf_arm_get_max_ipa_bit_size(void) +{ + g_assert_not_reached(); +} diff --git a/target/arm/meson.build b/target/arm/meson.build index e568dfb706a..2747f4b404c 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -32,6 +32,7 @@ arm_common_system_ss.add(files('cpu.c'), capstone) arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +arm_common_system_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c')) arm_common_system_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', From patchwork Tue May 13 17:39:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889621 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233229wrr; Tue, 13 May 2025 10:48:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhW5B3rdaa3ByRcqbSCsS8kFK0aXelRo7bRJmk93CSRBXukrTFtDCmbKQU9snyvlpqYke2mA==@linaro.org X-Google-Smtp-Source: AGHT+IHfEaRHqo7NbO7oj6MX/aij1C/JTQJAAll10EWKqc3GTigMs6/AfmaQ9OyMfck44Hpw34aI X-Received: by 2002:a05:6214:2525:b0:6d8:9d81:2107 with SMTP id 6a1803df08f44-6f896e34f76mr4483066d6.20.1747158492419; Tue, 13 May 2025 10:48:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158492; cv=none; d=google.com; s=arc-20240605; b=Up0qJuSKW2/OTZEccZKzNQ6y0YdwwqrwVNLjlGIWpMZe4UJdEQvOf8WgLPxz+DATXm sHsglDoYc0vEyFcQ4vS1lzlnjBC1OikVKnIBuRIAsil2xCy/AaB5ZMwWlbwVBRKAg5pB s+XP+jkuRYw8kzQEl/VbMExKiCciTYHdbOPzuXKNrryaHR5iFoD2/PJl7gYwwxaKIgso 5nBEvwNurnL81Y2HX379w+t7OqideYB66HVdFAz/mFOBdxr2zYZdUO7p5DY5vxGP5vPV ysy6w5JQ0NmUGKNrSFRIofJBB9oQebVnSCtQqUEhVlp/IMWLgX6A87S5+XBZ4BqR50cg 9K4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YZUjAMI61frHwsGBUl1u718eVkak4wUh6JhRLUE3SNU=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=MesYHGnkV6JrG97zSWGm7Pa1tgwvh5R9xXgouSwMP0+UUrF78x7Uw8JyqxQYhPEyVQ vHe5NzVLek66SwnaHon/5TjIyTy6ur8nbSoeTwolnFHHHnYAmdqmlkmJJMYfo11biFKO MFXBtyBkp4XdUYjyWfrcx9e6HP3JXsetnRB/elIgce3w0c+LTQuqUK1Yz7TGOy4IPJhI aoCupxoLgXhQkJormAzCsxsfA+Cwu2AEA/PxZP6ybI39FrJp8qOZzMVxv0MfpwfyV2xf 6rSAqUukyliZJIy/p8TNe/Tdq0NWvM2ZmunGNls0x+8NzGQ1kh6WcRdXRvjkAiMjGtvT 6uSQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LjFKgDxe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a4ba94si116274056d6.314.2025.05.13.10.48.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:48:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LjFKgDxe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtgt-0005FG-Fu; Tue, 13 May 2025 13:45: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 1uEtbZ-0008EA-I3 for qemu-devel@nongnu.org; Tue, 13 May 2025 13:39:49 -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 1uEtbX-00038Y-Ts for qemu-devel@nongnu.org; Tue, 13 May 2025 13:39:49 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-442ec3ce724so7384895e9.0 for ; Tue, 13 May 2025 10:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747157986; x=1747762786; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YZUjAMI61frHwsGBUl1u718eVkak4wUh6JhRLUE3SNU=; b=LjFKgDxeOXmbcmlYajA9+glyROi11ehKDqpeIV1Hyh2FutMmIGiDhD1LP86hej9dlN 0spvGxCtMGD1xpU/B7RCWu0f8DJBP/EMOTBjqhMNxXsNJJtQXFYuorZz5n377w20ah+4 l/+Uh2MU0Z/pWrAfzIh0xf4NybB4QWZtYXqle3cfPEUdmMN4h5rcB20WEhEQAV9Lf9+H mB7VirJ5rqRL3aHevfTv1FIZ7n1ocEuuAjul8aGHwL2iKdJvbauVX5P5vWZqXiNfC3L6 2D/G/ehZVCXJyWndczz+MekXeUfDFaStGQ0Q0fD7uzFGsQXq5ope0h8L+fuXyYEGN3XG enAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747157986; x=1747762786; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZUjAMI61frHwsGBUl1u718eVkak4wUh6JhRLUE3SNU=; b=TXk2AcQbLzUkPrfVfweUtj/aawNWtoIXV3LHt9Hs33KiXC6kNK3jIppDp/4HAH1VKF WkQ909xNy1KUXTzJhKwChYQEK79B63fQlvAhp2akrsr8somQZpFc+Arp+87Hqil7WB8H y3EPjjnv+r4DnWwk5ZgMotB01tqX+iJkbKvT47Wx0FUYl6sBo5LivbCc41drE1gRLTW8 Pm0PGqx9pLogKm9NXv38LyL5odMFzvRBa+CvltdhuBrwEDgsdRJzVRSzkLGBlrDT7hh8 4q1splycFn3n7tTA0AjpBFvovE4kfqvc97kGyuXdgtzYagsfQDkIUPBpwg8KyqdTQPXN cB5g== X-Gm-Message-State: AOJu0YxTz0K8Itfbm6HVPP47oldyoJbeLM1u0Uo46DMYHz7gXg98rLIU 0bWISJkAwoXXl9C8RCJA4F11DKs7yfQEBbWYseiUY4/rEhAw2lk5C6JDkQgx5GoF03WEUDRLV7C MpHw= X-Gm-Gg: ASbGncsDk5jlm8KaDvwPlI01tbu6amvM1QyBgPkYSDgJnq4RhRbMlki4RIVO2m63x7F l/LHYo7fW/HQH3NV2PI/HP2HA8DZzuHBuZhY5B+DN3eJPWo1ouXNFYlCLaquZuCbpUj1HdPNoKo WFtH4AHc2wuIJpUFaeLJ3z4KcP57JRYwVZXbCI1j/5xON49D8ARI23qswgl0f0zbFAYnlK1eG5c kGJ5JnKg/pszDf8rIvEKwBwl2mom1Lf6WQD2M5tNxXOXPZfRFw6+kAkb6MKzVQqjpCyq8jbCVpN mVcB6u59+h5thodXz/l62F/NSoBOX1sQAcr+TiUAPK7uxM8phrrxrtRgEUvlJfo2li3AQlf29NB MQzzsxnLw9O7Y0W5iTlgnSpsDf0te X-Received: by 2002:a05:600c:1e89:b0:43c:fa24:8721 with SMTP id 5b1f17b1804b1-442f210fa5emr2720075e9.17.1747157985932; Tue, 13 May 2025 10:39:45 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd32f331sm221365035e9.13.2025.05.13.10.39.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:39:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 03/19] target/arm: Only link with zlib when TCG is enabled Date: Tue, 13 May 2025 18:39:12 +0100 Message-ID: <20250513173928.77376-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since commit 538b764d341 ("target/arm: Move minor arithmetic helpers out of helper.c") we only use the zlib helpers under TCG. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/meson.build | 1 - target/arm/tcg/meson.build | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 2747f4b404c..dcba4ef3792 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -3,7 +3,6 @@ arm_common_ss = ss.source_set() arm_ss.add(files( 'gdbstub.c', )) -arm_ss.add(zlib) arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 2d1502ba882..c59f0f03a1b 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -56,6 +56,8 @@ arm_system_ss.add(files( arm_system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('cpu-v7m.c')) arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c')) +arm_common_ss.add(zlib) + arm_common_ss.add(files( 'arith_helper.c', 'crypto_helper.c', From patchwork Tue May 13 17:39:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889623 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233471wrr; Tue, 13 May 2025 10:48:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVI3JcWc1TiS9ZZXfNw3Tv5t/Eu6KPMPrl/gkarDHb9+/RMMH/65G9vD/vNDC5z8vpvf6kRyg==@linaro.org X-Google-Smtp-Source: AGHT+IH9DkXBTtpKHksCnPutywH3ixK85I2OeVAD4BrISn6Sjqzp9l9Rxv+h7r/Ft+m/PunX3o6k X-Received: by 2002:a05:6214:234f:b0:6ef:cc6:953a with SMTP id 6a1803df08f44-6f896e48065mr4056096d6.12.1747158526848; Tue, 13 May 2025 10:48:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158526; cv=none; d=google.com; s=arc-20240605; b=UZIddljZhBCZUc0CuLUM3tUhqoks0WFfj3mWBvXkmlhSNyAbkNizZkjN+Kg/PoH+Cb 6FCLm2Qs1ufZZTPanCDKz76MdKs0tBVvTZPIvZ97CgrwBP5BpW6ByGLD79sLxw0Q5LKO HGckb2A0esmfj/TM/dsD9pkdN+Pbm9cuky1kRosvBrVVyFSAhdMKv8T/5uNzE5F1GvO2 J12V5A8XeJAIulrqI0HmWPRtVOQvtvaeqeUVF+wPSzddInT0tSnVbaA50V/p+9nhUtle 0Ge58Y6WNdj6WEMc3PL3KsFoL72Jxobp8uHhMktsf7K+iaa4mX032OAEfyeoD+AsAlrJ gPDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fZ+iRFzlsz++4RFD9fl5KNYh6wELAyZ06jqDq2TXAd8=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=OEjW3TUSDs7/JmErgn1etjK1z/qiHB/YVw1UyKPt7jtSA9muMUPnoBJiRdgI8fs9SZ 2ONBupBWjZyFTHBxsm0SkJCw6DkYI6+OPDdZF5NeoZ1w2fONACUzbZViyjjT0eVkQAsR an19HqD2AorQm/0NtIt7xNakYcVhTt9BBB2owkyf7qGkfKSt2/ytFT/cxh7JNBJXAJlK dDPMAKzZbtMXf0excnXk154Dowq0kyAcSYy9XcUzATHGqMHBWExD+h4UN6lzaaeqslKZ ryn/rmQlnQQ2zDKJg2yINAD3odddXU8qVtCKO629RRyAHRSMGt/EpVAiBjhm0mJp/3eQ fSXg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lxDLEpMI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e39f70bdsi115370156d6.104.2025.05.13.10.48.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:48:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lxDLEpMI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtjY-0007nt-U5; Tue, 13 May 2025 13:48:05 -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 1uEtbe-0008ML-25 for qemu-devel@nongnu.org; Tue, 13 May 2025 13:39:59 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEtbc-000399-Kv for qemu-devel@nongnu.org; Tue, 13 May 2025 13:39:53 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3a0b6aa08e5so39435f8f.1 for ; Tue, 13 May 2025 10:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747157991; x=1747762791; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fZ+iRFzlsz++4RFD9fl5KNYh6wELAyZ06jqDq2TXAd8=; b=lxDLEpMId/WwWYWmtwN0ALnWCGjktA76umZDnrHyiO9iauuztAjA1/rGgw/FMICDTc 1Vjm0fcu2jRmt0LFE0FfpytqlfG3MY6r2MSx9S7X/75exOLCOnsr/73mbyeltuEPKYKL UvARxRrUnNcV/VGhXsTYj+4S2u3Nd16OdYdT8zZGHzBYOJFqrwXdpyMVYpdTnXb9DwxY 1UTXvnaB0VZ6NLsfmZQdZByLC3ObdMOykqZOP0dH9YLY1TR12eAE7KfnL//+UNEuM3jw Q7T78g51MY8E+REOWmcKAF6EQ8oZpl3O9xuG9aB+ls7AzLzNaXImOxhqYXuj+baMiFp6 R5MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747157991; x=1747762791; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fZ+iRFzlsz++4RFD9fl5KNYh6wELAyZ06jqDq2TXAd8=; b=uk/ftjrBsD/hww53tz+p25G2ncmeTp3guH84Jr8g9KoW93QoBufdq5UZXvSb7MLZ9T y7N3UsZc87lBA1qw7z0tnRAr8FIVpltdTdOiim12rt5wS4EpuN1bcNSt5w1NN3gvRJfA He/ufB7fZz8lSbJ1oFfwxL+t/6/7uylj1G/3if7ccnrV+wsYrGQ8R1wAk1k0OpS/57WQ FOv3Z0MWauatYNQiLIcmbKbxA6X4PePk5HygV0ofIjryjz+OUb33PYb/0tqF7hti62Pm kYjzer8M93YZ5A2TjrSUOjS5DGZlAEobP5Uvr1mj8qqf3R7AJ8V9j0R/Sngl28u0r/n8 gsAw== X-Gm-Message-State: AOJu0Yy0z7A3eEBL1PULzfOL+ydELY3XuPaF7YHAkuLli6lwRvs6EwMl lKl6jnj+3w7tCjk6ykW1MvJv+09K5I4V4T0ePiknLXcaztcJhuOMYG+aTa0dXS3Hqul4Gmg3gtT czlM= X-Gm-Gg: ASbGncujjkAKybeaOSvTYzciCB/2WPi6MgEXhJOc7zc2vyAH4pUysOmVIz+zR+5oIOW PHxlLF6DFFa81jtYRy7h/hoTMD33wHqTROV5qavb+gdocNwNCuV9inkgND368KLPfLt3qNnWujT oxGQZ/T9n2kKOeIndC/vBTKu+Awdg7SVnzVVage1iQ54TRnCFXnXLC5APkUnjri0VxvMw1KdmXe mrgC+QcEwjr23h+OxD5fUnABuSqsH4nJKoyb/V84RDtEm/WX0P0u2Sf6S+xiqUqDxCqZf+Tjd3Q gDxuG9qXVhGRHe+2MP2hzqOz3Q145/HKUMuFG1Czj4u2r5f4DEfUENldp3WLDaRBECaFYoaqS55 OzX9+JFU9GPqWfK50HU6t/jKu8AiO X-Received: by 2002:a05:6000:4283:b0:3a0:8524:b480 with SMTP id ffacd0b85a97d-3a340d15a00mr3980462f8f.2.1747157990807; Tue, 13 May 2025 10:39:50 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f2ab2sm16803819f8f.46.2025.05.13.10.39.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:39:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 04/19] target/arm/cpregs: Include missing 'target/arm/cpu.h' header Date: Tue, 13 May 2025 18:39:13 +0100 Message-ID: <20250513173928.77376-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org CPReadFn type definitions use the CPUARMState type, itself declared in "cpu.h". Include this file in order to avoid when refactoring headers: ../target/arm/cpregs.h:241:27: error: unknown type name 'CPUARMState' typedef uint64_t CPReadFn(CPUARMState *env, const ARMCPRegInfo *opaque); ^ Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/arm/cpregs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index 2183de8eda6..c1a7ae37356 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -23,6 +23,7 @@ #include "hw/registerfields.h" #include "target/arm/kvm-consts.h" +#include "cpu.h" /* * ARMCPRegInfo type field bits: From patchwork Tue May 13 17:39:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889629 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233911wrr; Tue, 13 May 2025 10:49:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUPOHoZrenXq/Nm1wSs6UPfSgDW2V1xIBF3epc5Q+lY3Yc0h5WqAPkpO6VwWDdOgO4mCTycjA==@linaro.org X-Google-Smtp-Source: AGHT+IGIJ8POtsYDUOBWEznkUPDripsvPDxqkeNczGJ56G5w+KJ7KxQCUXKulrqu3oPpq/PKCWHi X-Received: by 2002:a05:6214:410f:b0:6f5:4d7e:9687 with SMTP id 6a1803df08f44-6f896e6423cmr4816026d6.27.1747158583953; Tue, 13 May 2025 10:49:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158583; cv=none; d=google.com; s=arc-20240605; b=V3Vxo3S/lI5LLVLJ+7a8LqNMULINwmsd+lt51NmHUmEOy9uYyd8x/d75N0VlmVclKd NDlOB8jAlETaqwmZat/m2B6Hj3nddnwkxlxeRR+wDWLWBlJcfUseVE/vhoqZRAdbxW86 g0mOR8KQAE1ELgQF0VG90h6Lrew2MXPogRDc2u3UKoQ/MT43KI3hEHcBccCGwhSVedJ/ x6znrO1FkJegKIlcTvNMpkZ9Yuo2ZyPoBW3/SO9XyssTKoiv+okjMRkF4jXg+n9m62dY 2/6xVMAIIWlSA7wEf/SmvDLUGxNTb1ZOvNKXupSTYEnHl8ti2RnH8QVbNjzfpA0jgWNG cpHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FlgmqWinD7NQwKFSRiJub8ZlgVYRN5tlN02/pnlcz3E=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=Ic15+F7Mn+accgOg/v7WU6+2oA9Rs0p4hJM46TIpaYzk6twY+XnwOzeLUe89Bruj9K Xg+gcDP9Spiekp1Am3yZQLwrjAL1QcCBoMe/pmyS1vc0/AzRbI0FqkJYCOArKBKhAe2l JYhY4O4IT043O5ilTeQLgr0ZnHTT5I7oSjdJhJHgrPgJ+yVGqmdis/A1VlU0CYDj/V33 tyCMpSakxG8QEJj1gRWsSVb3fxwp1jvuCyPfPcFL9ViMLTRVFK0oIKKiTna7BMifVpJ0 rKgAaQaE5WX1tL1KT8CsQNaLZ1hRCtN8C/XalJCX5GXk3KOwVHKbx/bX9FxNdwV+hxSU sojA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H2lcgZv5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a58c5fsi111316206d6.423.2025.05.13.10.49.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:49:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H2lcgZv5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtkh-00043x-LJ; Tue, 13 May 2025 13:49: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 1uEtbk-0008Pf-JU for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:00 -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 1uEtbi-00039Y-WB for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:00 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43ede096d73so41384235e9.2 for ; Tue, 13 May 2025 10:39:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747157995; x=1747762795; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FlgmqWinD7NQwKFSRiJub8ZlgVYRN5tlN02/pnlcz3E=; b=H2lcgZv5lkwQ2TjE6djdysechGwVmP+Mfhq/Bc69c6e3mNH8PDEikqxA/89a9pW9vG p5zgZXWqpEqkb1Axq+a5HOtUIRQvHNmBFnELZZWOwrhG4YAeCpn+o+4CUuJvbbfP3CjT Ar/F8Xfyo+ihd6Y/kPz9Cw5dyqmt0fbVHdpR5izTdi9n8gKjNEExChNCIKO0JxJ77jfV eY+LU3B/Qbp6r2+zBgfpCDF2sg69hWiO1vEy9p9Q/NbG/w3rJgL6cUmxozs/dSlrHI2D KT84aze0O/kbafG/OjHmVITlGHrjqKM4gfxORqX9wRvGo9RDkZq/iKvt3RMtDfDgtwTI oqfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747157995; x=1747762795; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FlgmqWinD7NQwKFSRiJub8ZlgVYRN5tlN02/pnlcz3E=; b=dqrPvtsbMkvi7AQLsORsXXtqgsTok2ES8/MbSYHaLmzO3IzT12jGFaFT9P1TmHoQZY ybL18taccy5q7bz+7RdoRL/x9GbJxBHWGlThfCKwGUJBz/rrMqSEdzK48PPfSClnOud6 tx8ci/NL6le183UFOPDzbgVkcfE5tXsbKM8/Sjr7E7Ry+lFLL9arLksF+KWgdQBGd4pA ZxGEUtv50dRmHr28j7rLEYjkw9TwM7DKIjOAnrJKv5gbl+pRovIJixrFQQAuWM74dj/6 stkdyYodkUGhSCAWvvL44cQFRrF8zGZMs+liqsMRpuNbPEIURsz2tA6gyiS3oP8zEHXL VG5A== X-Gm-Message-State: AOJu0Yx7rfhiP9jWmItCesLDMYtOIgKNOsDH6naM9CalxhmFocl2tpiC VhknUUja19nSqviJiPndvcRK2TPNV2wYIlSeuvULEcSG3Dt0bH1w4ABlqIQhCy2jtGVRGOn5BXO EQRg= X-Gm-Gg: ASbGncuBmNvGJ1MBGCgqio1tKmoOZdUYO5YbNIYejxz34SYxJUTjvBW2kHt0IkVG5DO hBkvscEUz/FJNPEz0wOlOP/xu9d3VrF4SvurNXga67tJ2CbV/uk4ku2d+bVA8B4qe/70JCCpDAk B8qRhzdgPCuMKs/U5IA1NreKBFMXkjDVFFxuUohavfCeHmAmoEXufk1avRjOzSsDzBXmhtdqxoX ZV2HiZMFx2fSutVFnS6PxLj25aMvzK/hugWU0MsukmueAiSuFWQsFTHC7Crqbdt+xsd+EmRKZvA 1kdoQeS7Yd8gKqxAGBIVe/axN3zbJKy5pXMVjUGF97gQsQg+Tyfsi8126kbpRkAKjkKMEpEUmjG A2+r1rb4MEZK9wljXWCJ+FWbeX8qd X-Received: by 2002:a05:600c:1c12:b0:440:61eb:2ce5 with SMTP id 5b1f17b1804b1-442f20ffcc5mr2233185e9.17.1747157995571; Tue, 13 May 2025 10:39:55 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f2b29sm17198563f8f.53.2025.05.13.10.39.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:39:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 05/19] hw/arm/boot: Include missing 'system/memory.h' header Date: Tue, 13 May 2025 18:39:14 +0100 Message-ID: <20250513173928.77376-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org default_reset_secondary() uses address_space_stl_notdirty(), itself declared in "system/memory.h". Include this header in order to avoid when refactoring headers: ../hw/arm/boot.c:281:5: error: implicit declaration of function 'address_space_stl_notdirty' is invalid in C99 [-Werror,-Wimplicit-function-declaration] address_space_stl_notdirty(as, info->smp_bootreg_addr, ^ Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/boot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index f94b940bc31..79afb51b8a5 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -19,6 +19,7 @@ #include "system/kvm.h" #include "system/tcg.h" #include "system/system.h" +#include "system/memory.h" #include "system/numa.h" #include "hw/boards.h" #include "system/reset.h" From patchwork Tue May 13 17:39:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889617 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2231864wrr; Tue, 13 May 2025 10:45:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpjT8P8hjznsL2xothlulJmrI/oWljQFNOjZI2hYNMTUAtEcMhD5UF+7bYWp6jksY0JArqaQ==@linaro.org X-Google-Smtp-Source: AGHT+IG6D4BYyxupK/uuF9KJcVPopdzGjpRAfHbmVi0569g+H7oOBZAb5MAr8M+BiXnKXuHnc5aQ X-Received: by 2002:a05:622a:6091:b0:476:a713:f792 with SMTP id d75a77b69052e-49495cfdf8amr5623911cf.49.1747158298737; Tue, 13 May 2025 10:44:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158298; cv=none; d=google.com; s=arc-20240605; b=Y8G32nqqGrrnXJEm2bz25+DV0s5KinMrkOmNUSXm7s4/UVGZPfdImJqFeMSTIVBgDw HVznCyliLjXnVgxfsicWeksr6PQkfNdJJ9jatE1IIIDqDPwgL3X1KPOb5HLOtX+X+6cv gf4+kmO3fOx0EZV1hxlqjXIGpKoborbGYewe/JOam4vc3F/7asY9juaZKGOq1HZR5idR mtm+IZwmHJXk70oN82w1Mxa/wTLwfcYzW9VqrriEsWe/ZwTRyVdUWAKDoa7V7I+OvG2x a6gzPuyroZyWkpokwSar74mL7zCvaYgzduExC8JJ23HXpSuS1mOTcu/I0A34bEjsW+7O YUdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1DnV5Hp0tmpiDlfH4Mi6kMgDb46uwa+8Kt5FmKdT51M=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=K0dkcFL6SmkCmGpbzava3cYnesoKSfHQpphdHNzsp07i7JNF7sthKFmMy6s1uKyGVY 2T1uywjWHEkAywdlLEq5XfbH+kjPZmTjZHPtuj/MhyS5lTsokUENUjpzY7Gj6MNdO0+f 1HKftzqB1cyzb1sVzgwQJMj9TPOCDZu4GdmN12MKg42x1nr5jLrvvKWnnZkoQ7rA15jh 0abdsnwcWcxenYPv2/Q5nFrFhGPlyGrU+yC69MTtAOCH/6sS4iD1pvZPIs6P+E1b/lFu CKI+iH8V+LIEPcp35lQdrPdIK2pBRQ3imIl3sTHc30XtftQufgkOSKnsu2ctEXrGIxX5 12lQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lRWrR187; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4945257e2d7si117270641cf.364.2025.05.13.10.44.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:44:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lRWrR187; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtft-0003Ub-Am; Tue, 13 May 2025 13:44:17 -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 1uEtbp-0008UM-0q for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40: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 1uEtbm-0003A5-Hv for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:04 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-440685d6afcso65667055e9.0 for ; Tue, 13 May 2025 10:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158000; x=1747762800; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1DnV5Hp0tmpiDlfH4Mi6kMgDb46uwa+8Kt5FmKdT51M=; b=lRWrR187na1dm6eToYjimuxUggZNOr26rlpqJJL9Kp7H335QxStUoQkf3bpNTij4CI fvDS+qvMin7BcS9futLRJ4YGuvOJ96pw1MYO7UW795A0bPAZnDf11PQsyve+8dCyz8Lc 47qBz0M0Dg9Cl+BwuHQ2CLhMgJJVSLa0BjsN3yCds8naAXZhYWixO8NuxGE5b49AbxlD l1ldrHdPOwuU20zgDgkn77U6cngQxUx3wune4zcFh9fvYUGSUPuSm2Hi08DNPouMIkJH fc1IRwq4pTWzV9m9NOyhhlPBbZeSzZ7znSFBQhEhSA5RsZQ8igSSVATOmm5qSp/Vj3ge rkiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158000; x=1747762800; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1DnV5Hp0tmpiDlfH4Mi6kMgDb46uwa+8Kt5FmKdT51M=; b=jopH7KuQNEYIuKEC+fqCxlkjH5r7trjFJ6QSQAY0R6iRYKGtaPaHi0DEKXxy/04n4y z9Pp09DrPdlDW/dDE6UdO++977F90+UIVEUu1p2PxLYeifYfiS2RXoz2q46vfTu0qXsk +WSEaNbDAABUyMVcEH8jQoxzhQmhqSd/6ghqbCBRBrm0eH/po8xA1hO5tZ/jjsKb3vA5 zkqxkBkYWSYIAUrgwumRpASNPsvryEHxzOaLd/rYsKUN9dE8HuDBOTAO1q1cJyRjwoTR DTAtUiORlZYVjMxqosowQ6M+xeYPLlBWRJSWZK+rzOp9+BuPF32wLpG5fFd6QOOh2v3A 10sw== X-Gm-Message-State: AOJu0YzCNhnpNUNCocy6KhqAf96JghoWGQ5CeeI6baW7EckDqSe0wOMu XBkFfP5XHQvV2MdNnlXp6Zw1vtuHKLC0AW/IH4thPyyL7cdk+lt1gs9qUMNCEuKbhXNmcZJzIFA 1bi8= X-Gm-Gg: ASbGnctQ6E3E5vAxn1z8m24jb8+kZBmwavUvRrAueOqG62Q9/VFdCKB3b9h3hg2CRGB KSTsgaP39rq6AQcK+pnKNpKvylwoo15QPW2RwdD4HRZZvT6rOslShWW4YAIPxqGDOsRxmmhrBCK Rxl9lAYlZDdJm4cgb0ex2Dw26HBQLD+UGFr71eaWa5C2rOyhzBTtBqUIcD2wKNlBLpEpq0m/me5 XvMkcblJ5lcKqZheqJbNU4I8FV7KVTblSaGJM/Jcf5UtBjbJBSiVPE7MJbeMffv0LEzn1XqfTCM Jlh2gHf/9gulVBtjSA6E90oe1WwkdM8Vwj5gNqgNhfN664xZ60UQ8rbGw8cpdOtaxi50pXyPq8g a3q6/UsrhV/r7G89pHZ/QgODJ4kwN X-Received: by 2002:a05:600c:4454:b0:442:e109:3032 with SMTP id 5b1f17b1804b1-442f2161883mr1705145e9.24.1747158000373; Tue, 13 May 2025 10:40:00 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd32835dsm220888235e9.6.2025.05.13.10.39.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:39:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 06/19] target/arm/cpu-features: Include missing 'cpu.h' header Date: Tue, 13 May 2025 18:39:15 +0100 Message-ID: <20250513173928.77376-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org "target/arm/cpu-features.h" dereferences the ARMISARegisters structure, which is defined in "cpu.h". Include the latter to avoid when refactoring unrelated headers: In file included from target/arm/internals.h:33: target/arm/cpu-features.h:45:54: error: unknown type name 'ARMISARegisters' 45 | static inline bool isar_feature_aa32_thumb_div(const ARMISARegisters *id) | ^ target/arm/cpu-features.h:47:12: error: use of undeclared identifier 'R_ID_ISAR0_DIVIDE_SHIFT' 47 | return FIELD_EX32(id->id_isar0, ID_ISAR0, DIVIDE) != 0; | ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/cpu-features.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 525e4cee12f..4452e7c21e3 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -22,6 +22,7 @@ #include "hw/registerfields.h" #include "qemu/host-utils.h" +#include "cpu.h" /* * Naming convention for isar_feature functions: From patchwork Tue May 13 17:39:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889624 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233550wrr; Tue, 13 May 2025 10:48:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUmvh7D23ccgp0xBs3mqTVJOm7nl6QYhOlgYvh0GfTaZ3uHup7mWDYFOk4fXBlcU2jfAGx6SA==@linaro.org X-Google-Smtp-Source: AGHT+IGJJOt7JPcDrDKyO3f19J/yfolHAK00p/IIwcYf4Joc4q0yI0pxTKGESXjbIwT1RdkuOKNA X-Received: by 2002:a05:620a:1712:b0:7c9:65cb:6214 with SMTP id af79cd13be357-7cd28800da5mr72583485a.17.1747158535558; Tue, 13 May 2025 10:48:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158535; cv=none; d=google.com; s=arc-20240605; b=AjfbA2DHcsKovGRjiZpB9JYkKEwbX3vmLEl7ZUMTCTiwPCiAqDLp5bKt0zHKIrsCfA i18rIQoIXr1b5rPE154Qz5On6mFaXa5klvdJvQJnpRyTTNT2wopZzuoM4G2hOw5GyYHy qMKbvvaxL/uFqJrrthtFn5xZJFfk28CK4VOAgJPfbn7taFwCK6CDmeEp9+EYg4ENWaFJ q+fGqiqocUZUNsQMokrWznV/SyXD2AJGBrS+7lpVyUTq8aVZojKBmBs+jNCbA2Mi7Nkt MNPMzXCe7aReUTFfX0jctUF50B7zSaGMDvuJtVfM0Rorwy1MC5UaAEVPORMgb0aqvfDw t39g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=j/lGVjd8P+mmHimB41hBIfndruizKSfZ7N3NnHpeffY=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=RKXWZm669e8/4jSqFnFQZkwjtIcJhoJwcLUc9Kcd0tHRsN+VrGN8UKHJ507Ors8QAw 5O1zBLiYY+2Rx+DvhysTXfN3HnBtkNx1NGMKnkIOPQxOybGOZjYk2dHvXFa2dfHbjc9d a2R27cSv4lVSMpdgTSbY6pHgT1HSrXzqvVQcmAA3a2pJbynlF9F5CRoyvynxO7LZHlA/ ipSZQGBaJOo1V5ZV2qPKOmD05CFFHdfcZmDB/lsAx/zLX1vYIC09gtZeI4HFNXD83zIg 9QjuaTpfExRY17TqbcExvphWxSp37gZlq8AW6AEkOK+mviXHWOBoVWWwB6wQyy4IhFkO REoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=njWLMuxO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00fe15f4si814947085a.364.2025.05.13.10.48.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:48:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=njWLMuxO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtfu-0003WR-Ok; Tue, 13 May 2025 13:44: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 1uEtbt-0000B5-3T for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:09 -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 1uEtbr-0003MG-2m for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:08 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3a108684f90so3622659f8f.1 for ; Tue, 13 May 2025 10:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158005; x=1747762805; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j/lGVjd8P+mmHimB41hBIfndruizKSfZ7N3NnHpeffY=; b=njWLMuxO+4sD9GurbFKevQDfEvqow/KgyTXQdILXrVE8P2mLN7E+57M6cGQGUVPT6K ddRSxijVudA/l4jXCfO+Uz7173r5h1Z+kWEAgEV53JLd93bTfUwCpnkwSM4U9Z0Fkm4n 3ePAVI7gSILFr3qLJybp/1sNbwJRijWatJgNEn7LQWAROukNr4x2tlfZnLAgchQPMyMR 3teQwyxRg7nkIfKIRsV+iVKQTsFnDNJyOh24FHh2i2T1tGD51XyeAxHWu56kc5KvwtsK 7+3v4LU2fUjzJeX3Fi9vOK5XTE0aZ7550kqAY/6RCZNdLgD6okEG4UhAfXK9LAqZWoth HWFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158005; x=1747762805; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j/lGVjd8P+mmHimB41hBIfndruizKSfZ7N3NnHpeffY=; b=XDYhIyzoBozNSAjZVlfR7pZr9+zh1xTIdiNzdOfql80QxjH7aGO6yrujPbQW5WQONY 8dqNRxDI61UpNGr0Qv3z6JvfqkwhFV9+ISGLtSoEC7DJL1YNbr9ITyzWv/Cyv4JdrOxn r6442pq3LSDSMxX5b0YB5SYYPc8v3HXhZqYurCmb0C1r0gEhwuXwNOo01LvTZ02kH1s+ XaQPc7oCHxema+pO2Rx5ZqfP1tqoxzUjsAmMYqBY6B/6uHcnVnP4HZj+06h6EXrlwSVB bAYZCKFb/qokmRxtvlnn4dSPBUUzecxvWuFyJm2RgnyV3EZkoh89ZXlygqZ6DoW/sROq pQdA== X-Gm-Message-State: AOJu0Yx4Iaam3ZADWjatkiuSgFq6mbtk71jSpqRECf66GEnjXo8f2xR5 9gIJNL45y4VS43cxQ5MixNLBDBYcqgIwIolHSeeVIXQ1k3DwUPMGaC9oeKcw64qZdlfxILHfxwb erOw= X-Gm-Gg: ASbGncuiKgOeoANy8DVf/TpdfRB6qLHwDplbD8FCLCcDxOIHg7z5sEZwP3NZ/Zlj0M/ e8dGesO/Cnxvx263tZizhgKm6cMZa/mFKwFSKN/uPAciuebL+YMacfP9hyXJMhk7af6DNHCxpqX CDHDY+V1Dmk0lHqlmGv1zJneQ2pv9KgxQyA+3Vbme++6Dc+GMTGwZPewmV7mibBQs6ZQJ7/YZ75 pW7dyWkr7ffj3SnRZKWPMPXDwlLgtSNM5z4XnGlByifssP3giqnFM5/lflCLOjdthKhlcq+gEJO DmQey/X7pJpVQhhBHDiVGhCULaesmd1MVT3ged5669xHFwb5v2R8Qi0tizU+5u8lh17gJEV2WYy yBzQV7oRklM+y8+LaDKTjsaHHEKg/ X-Received: by 2002:a5d:59ae:0:b0:3a0:8495:cb75 with SMTP id ffacd0b85a97d-3a3496997d7mr196089f8f.9.1747158005233; Tue, 13 May 2025 10:40:05 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f57ee95asm17105644f8f.11.2025.05.13.10.40.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 07/19] target/arm/qmp: Include missing 'cpu.h' header Date: Tue, 13 May 2025 18:39:16 +0100 Message-ID: <20250513173928.77376-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org arm-qmp-cmds.c uses ARM_MAX_VQ, which is defined in "cpu.h". Include the latter to avoid when refactoring unrelated headers: target/arm/arm-qmp-cmds.c:83:19: error: use of undeclared identifier 'ARM_MAX_VQ' 83 | QEMU_BUILD_BUG_ON(ARM_MAX_VQ > 16); | ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/arm-qmp-cmds.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index a1a944adb43..930ec37413d 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -30,6 +30,7 @@ #include "qapi/qapi-commands-misc-target.h" #include "qobject/qdict.h" #include "qom/qom-qobject.h" +#include "cpu.h" static GICCapability *gic_cap_new(int version) { From patchwork Tue May 13 17:39:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889631 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2234909wrr; Tue, 13 May 2025 10:52:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjeAk70a27uqrLc1LkZ6P+f9MD3clq1MWUz1CMUYFXLCQecbm6nLMJixjm9H6cgC9PbyiVrw==@linaro.org X-Google-Smtp-Source: AGHT+IHukXlfB3nubaQUK5FBEgUBn3w0Zr+01V2U3U6PAsNNAs6Rr7ML0oSZ4HN1usyEK9NYeA0R X-Received: by 2002:a05:622a:260e:b0:48e:143e:d4da with SMTP id d75a77b69052e-49495c76a9emr8179861cf.13.1747158723392; Tue, 13 May 2025 10:52:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158723; cv=none; d=google.com; s=arc-20240605; b=RiOorqLmhT1xKGkLYxFHWQWpKx6KnMX5gY9HPl+YNWe00vRMCC/upP7oQuZraiFeG+ STAEAJUbuxKYdD/CV3Kb/An+FATSuLhIZpynbspRnowDZjMG7s/624Fo/o7sW9dHr7SV hJT9rY0BVQX2xHhOy5HfKIIJ2VVFNu0uS3LWTnr4ZX40zgTg8LNB9j47wO0zFKz248HH RmnyreA4i23vMK6PKcJPexPqx4Pl4PQTTwoTZYN1oFx8czldY/kZc7q8/XfSM0BFY/IY oIPmU4/SBioyWyct18ZxZaLlAzXfxamVAsebJJHCQUEH5EHhvv1eIem89uNN92rnCIzh WzgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4Yt1id2RxlQ9HmFh2CVejYPkAilxVPKGmzO8+uGHOl0=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=BOi5YfIZCuG2dgtD2g1+O+p7WpfCWUQWkpZmsqxNo8T41Oem0gTTzg7O6hTd0dhcU5 wEbSAeWj0Prme0a33M5AI1UBosGLHfCFQ2Wlf4vXDtJafhxufvMDo53MJCglwPim0vO1 r4ayWlbG8TRX8oAQO1EVR425NFYzrk4Ps/VBQJhTZA+4ZgOBEDKylmezyPg0G9KsmOON E2ex1hdci3q8/pg22exRqnmjbGcqDOmD1mfSJpdRwR5wxIrfezQXqXzgGbR6pQEOhfNQ 5NYmznHHcx60zvc2CfI4PhNJotRd2gddfEf9f+rEQQkyejcP8LeeHzvYWxldfG4e2fjT 0IVw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y0MTgd2+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4945259b582si108842171cf.547.2025.05.13.10.52.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:52:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y0MTgd2+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtnD-0007qL-P1; Tue, 13 May 2025 13:51:52 -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 1uEtc0-0000GX-3L for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:22 -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 1uEtbw-0003N3-Ak for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:14 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-442ed8a275fso7593625e9.2 for ; Tue, 13 May 2025 10:40:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158010; x=1747762810; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4Yt1id2RxlQ9HmFh2CVejYPkAilxVPKGmzO8+uGHOl0=; b=y0MTgd2+hSlRFN1atAMenypXJU4gBRYzjY0te4ZAHs7qd0NnDPvYm5AME1AM0LeoaE PTsgGvh6Y0ORIDKevsaAXggpoSIL5L2NoidvwIVU7RwSHha6SSzVJipl8TbzZSZ6Ol3L hjD5/ANpsFnwhgrnK4MHRaBGGZCXT/aYydntJaVYYunJJlYkQN6psZxZCtD3zhIIENQh Kw+U/JduWLzmpmlRxY2Oj5wLp51bASdq++Wg1/g5CupuxiGvIPiHv9nt48LLdcBmN/1F XgkbeDAwJeLeOuAcfeWMZxXsQ3lT3XSG3ekYD/3U6i0Cu+sobv+W5WvE/aMvNkpVM0O2 rLRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158010; x=1747762810; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4Yt1id2RxlQ9HmFh2CVejYPkAilxVPKGmzO8+uGHOl0=; b=jUIwgZB5Jm71657+Qh2pdlg3t2KL8hhQa7SOhpXH5PoivCNNInZxnZt6F3w7Cb/ExG P4y8uOFMQfbeJkKVlbMUQjfuA2RrkG2YSN4+t+nZpRzFxIMECATD/Z+tpy7mZTEUCzWR SpAjYd6GGyp0S0pmJnkoMMUqFjTkSRFp04RN5xpP7rfrl4f10y8uNC3zL6vscA+U8DWg SyEmMpTgNiaPVka/YV+dNoGIf67JkRKPsXb0C+tKsdDUYWhNhkMqEIaxwg7IsyFJVAZI osHlS1tJsxSIsqAwLbUMtFzYZgd6g0tmTydKv2U74J2bGpKr7GQe2XWqEhIv2Cgctm7l soMA== X-Gm-Message-State: AOJu0Yw7pnBryWa4+uhe2QAkzzw/unNZyzOcCr3KNSgR3ofGp2rbPpWL EwX6Y8UuumTkvAsQSgMLq6q0z5Ee2QLRSBmZxxgofJz75+LN48LlOQQug6R/bl2Rc/6p5lHlB7L Q8JA= X-Gm-Gg: ASbGncuLjRMCNbK3OIHW6lutUBWrNAslQIKSuUWo6TaihK5CJau+BBmGmNKAieyiQEo 4PCzwgyvqFzzNAr/rV8VXboiUYxofhp47TzqLtUAV/FDBOIM18DJy/VQc6VtqjaRlmHko06pLp+ s/xdlLCq2drcqLnwf3WNDLrUwKNlzZyFdT5lWu5dbQRxkI3EM0YUbpLVpOpXdhuMQ5T333XE9+e q6saC8eBkxgz7LGvDt2XVc/2CTggtpppLExXFCv2e5SobJY4+HBbbkRLHgRALYvBdfnd/YF28Bk Jb+wkQXvMD9ecUXxANuDB5R4M0wdFE4ZqdgObkkuWORmM5DyxQ0ODsdvInogkpE90b/que6D/pY /IUzZy8jzyMHsmfT1X03u/vFXPDTC X-Received: by 2002:a05:6000:4023:b0:3a0:b294:cceb with SMTP id ffacd0b85a97d-3a34994f2a9mr127385f8f.54.1747158010084; Tue, 13 May 2025 10:40:10 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f2961sm16974292f8f.45.2025.05.13.10.40.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 08/19] target/arm/kvm: Include missing 'cpu-qom.h' header Date: Tue, 13 May 2025 18:39:17 +0100 Message-ID: <20250513173928.77376-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org ARMCPU typedef is declared in "cpu-qom.h". Include it in order to avoid when refactoring unrelated headers: target/arm/kvm_arm.h:54:29: error: unknown type name 'ARMCPU' 54 | bool write_list_to_kvmstate(ARMCPU *cpu, int level); | ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/kvm_arm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index c4178d1327c..7dc83caed5c 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -12,6 +12,7 @@ #define QEMU_KVM_ARM_H #include "system/kvm.h" +#include "target/arm/cpu-qom.h" #define KVM_ARM_VGIC_V2 (1 << 0) #define KVM_ARM_VGIC_V3 (1 << 1) From patchwork Tue May 13 17:39:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889634 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2235325wrr; Tue, 13 May 2025 10:53:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVzen3fWPU0PuzMdf52SJl4amAlCZ3Sox92J38QhoSQBHZ2CbowImlK+m1IQBPsXMctZxXDxA==@linaro.org X-Google-Smtp-Source: AGHT+IEf8iZPizBjq92aVmxguCgfXCOakxuHxBTLa/Df9ZTL8jVBON3B28KOoFriCBaW84aEv3rP X-Received: by 2002:a05:620a:4108:b0:7c5:ad56:46c6 with SMTP id af79cd13be357-7cd287c98a1mr89530485a.2.1747158784224; Tue, 13 May 2025 10:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158784; cv=none; d=google.com; s=arc-20240605; b=OagYCJbW3/cQG6Vbvz5uuT2ATSxX9ofVbBU6l5aalx9fKPi/qpKujE2sOSwH5+PmnJ 2bprVTiJqmfA3khWFWbueilmadC6F6zAAi+dBm6rm97wYXDPCBijr5F1S833zDkslL2I mO7g4gBB4dyOCMvVdmJ22iba7A8gWTowHHDBazT0v/Xjv3a8RNkfmVzckUIer2DyKYey UTsCKuhYYsz7/CYhnGPgkeJaeQdtlyt8I5aoKMaTMPwjnjF9mnDrJlDAhx9vyUzJSmbN oOFl5IxYjhkT3g1sgy4c8hky8AWaF50JdrpalEgcoTy39YMeVn/xns9ihXfCKeJjJdci 3TYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jo0KGiOqZWbyCmUkMPNRmBmFE7abFdGaEV66vf3nIzs=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=YZkPBkYUvswDF37LV4jfSsE0DRRUunucxtb/gLAmGzkDKp6TAZh3ZP6NdqldHs4hX0 CPUtwTUIFDycA6pCfoipL1nKqQWvrOrP5BHFP/qqr6+kp6j05AQ9xuQsL225l9RjffSj DM4tBze2LFgx0+1cZOvcQDppMrOwbe7EN70JSHReBWqOmeWmrQlxKdtMKWgnZGZ53FPN EzuXB7v9lWw0iJ80gBWmrXHEllhSMaIDJJ0WAsONsOHQrs9l3dt96l0kJkejJzB8bRMM WqTIJ8z92d5+h6CNgd8WXWoiSRzP+xQyHEm0zNQ5e6v84T8tY/aG9FfF+fnGg5tUwbQ/ Of4g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cFmjVCC4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00fefdb1si1151226485a.542.2025.05.13.10.53.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:53:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cFmjVCC4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtnU-00009M-Ss; Tue, 13 May 2025 13:52: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 1uEtc3-0000IM-Kw for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:24 -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 1uEtc1-0003Nc-Ao for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:19 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-441d437cfaaso36470115e9.1 for ; Tue, 13 May 2025 10:40:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158015; x=1747762815; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jo0KGiOqZWbyCmUkMPNRmBmFE7abFdGaEV66vf3nIzs=; b=cFmjVCC4ELJGlMwpsAXnXphjBVydSZ931nkScWgJXs98svOggg9pAJISH/7RYRvwYr 8aBN+13f9oUM12sNd4CEQdJjUEaOCUrhxpAee9PYROhjgmxa8QqnAGKOMqKo4bQAQCXa 4nWr/wC/3brKZ9a022oDff3om+C2oIM/424oK8n1do2uZ4bIIgHfXRB4TjBZ+emcJrB+ xjXMDwsen4m5pkSifRJLxQIg2etJo7L5Gcr7p64RBdCS+5NqWZAXQdeVoS1rp4jhFRBF pXeBkcu430DaRvgJt30gqSvN+ZXvFcjvrAlYWN9mxKmhENWr2q2Qz9hzH16fKqs7qp1W 2G+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158015; x=1747762815; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jo0KGiOqZWbyCmUkMPNRmBmFE7abFdGaEV66vf3nIzs=; b=WrZa5tiMRhdeCkXHO7R/U4O0NnvxbXi5lOI5iVUEmjVd5bAqVdd33/em+X9z5JWP9Q GJJbOwWjjT+88FrTEC9Ecyo/nT0r5SLBZE1IlUKCjFqNtzIBQa0YsQcc1cg2Kqy+Lx0Z bbgDt0INTFFBtJ9kg6TeEDeTZIDX1pXnQf0TjG7wGO9aOjE6LLag+C4ctdrgUlL0nO0y KfJbd0PYRmamL8uLW8tPuidvZeT5oySJEy6jno7Tow7zr/2GW6dipIksmPQRdwz5qx7+ O9joJ+B+jWTbMsiALP0EZOLukCyU79UjOPrUrM4K4lk8gbnjkGeukEq+mE7E4bJJoNAv dD4w== X-Gm-Message-State: AOJu0YysFwSwkgPNTQQgxTwpYscAqO0F6nn1KETZx92+L6yjQ8QQ/NJC N/sORCAlgKTyYkIb2klkDbd9iplJb8cdJM9MOUnjkjnDxHMZsQCQeoOn5CUjFUj7atA2b6gmfOW NofY= X-Gm-Gg: ASbGncsQ0rCD67xIEpFE3eTipMj/cXpzJFwnNRjkOxZjM8umlHysFXTGJGOKTrdLvjp FqIF/7f0cKWNNfbIFzfoq+JpERhQ6twOaNZItkMiQ1hIuIhnpihLXyH2sbrb7vZD0mtddDANQkI nFnjlBC41RAXHOuozQiCvMjR2iMQL416ZMOPuNuLIC8vvBgdCoeZFiAqcJLSLiSibrcztuv7Z7n 1Q8XuHisr+NyDsstCzcBsXRLZlXfqFSTwyyejQmdq1i4xedCHxFNm/OCjjr0itdsWoflFQoPvMI 9rqLtwq4hTCQNwXOhhec4Pa2GWuZ2tlF6iUo6JBAIamgHJznLkGyjbV3vnjfzFTvrAsNC5/C3wd kGhr+/hYc/qgeyyMlP2R9WmgXs/qk X-Received: by 2002:a05:600c:1395:b0:43d:fa5d:9314 with SMTP id 5b1f17b1804b1-442f216d802mr1693035e9.32.1747158014993; Tue, 13 May 2025 10:40:14 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd3285c7sm219433565e9.3.2025.05.13.10.40.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 09/19] target/arm/hvf: Include missing 'cpu-qom.h' header Date: Tue, 13 May 2025 18:39:18 +0100 Message-ID: <20250513173928.77376-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org ARMCPU typedef is declared in "cpu-qom.h". Include it in order to avoid when refactoring unrelated headers: target/arm/hvf_arm.h:23:41: error: unknown type name 'ARMCPU' 23 | void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu); | ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/hvf_arm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/hvf_arm.h b/target/arm/hvf_arm.h index 7a44e092620..ea82f2691df 100644 --- a/target/arm/hvf_arm.h +++ b/target/arm/hvf_arm.h @@ -11,7 +11,7 @@ #ifndef QEMU_HVF_ARM_H #define QEMU_HVF_ARM_H -#include "cpu.h" +#include "target/arm/cpu-qom.h" /** * hvf_arm_init_debug() - initialize guest debug capabilities From patchwork Tue May 13 17:39:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889632 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2235185wrr; Tue, 13 May 2025 10:52:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW57OF5BWv3dGtAqFz0pcdpCvPgudBKlv+uR5SRxwFdyUy2wMcpd1gJJYqb808xQqqvaCnDnQ==@linaro.org X-Google-Smtp-Source: AGHT+IFiar2wofukmMZkbnaDj6ZUGFFkZ3Z+CAz78igff0//oK+3aF4lnp6PMBRwGtoeUcnPyrxh X-Received: by 2002:a05:622a:1f8f:b0:47a:e70c:e1ac with SMTP id d75a77b69052e-49495ca3bd1mr5013951cf.9.1747158761802; Tue, 13 May 2025 10:52:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158761; cv=none; d=google.com; s=arc-20240605; b=Yic7p18SUSeMEiML0FLkuF+HflOLRIctqtcft7JgNfI2FY4DM5yTtQRpCru39OY0KQ TqtG0CeCE/z2iMdCP1YuQpy0yP4tqcaELvtJC+CKQHfoBxO+mGJgZ7aYRq8+H9HYqoeZ GxazmEaX6O7xIHYVQkG4KY59I1eoAmq3+qNOg1NNyOeY3MHOpvRrPEJIxvYt5OZ1OCDX 6N/Zz53BZ3FOWeOpNt/Gq13YhWLhRxLLZHpMJELYQy0HPakAtbzSNM8XiWjJPixJ+zG+ 2hWF/nvzgIA09vSc3hVGUifPoVA6qcrHSErQ9vepBhuMPEMEzdbrokWY7ezLSfI1pBH4 /xSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q8SAO3KJ++XWvDWuMU/h8ZGGLKmYxZ6lrHNEHZshFbA=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=hNLmBl09hzR9gZ6no2uA66i4pcn9rwYPhnv0ZRmgaF9OowuGQdIsxA0p4XoDFdItR9 2ikZ7J6Tl3tCNTtrQQR0iZIHzjW/cWAskbY55VbiArAFBr97bgQHXs6tMxaWgEeGO+4K gcE/ShNnD4h9Z56CGoLbaIs+jLAdgOoSwdL4wouDxdkOnI+g9vx5jottNJFPIV4UENLe bAPDnwZti5mMHfA25Wxzbuh1IMjuiyxRLx6soa/Zcv15X2zxlXJe+jy2gu6Lpa+5m02y xlrCOs9aP75VkVRe5PTtkmFrlk+4bI0X0Hi/pb5owNGpr+FpQzgKxDGo/5R8jDHG3JKf ouDA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jk5opCxD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49452458b21si111460901cf.24.2025.05.13.10.52.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:52:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jk5opCxD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtnb-0000Ve-MJ; Tue, 13 May 2025 13:52:15 -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 1uEtc7-0000KL-S4 for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:27 -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 1uEtc5-0003OG-Rl for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:23 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso40319495e9.3 for ; Tue, 13 May 2025 10:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158020; x=1747762820; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q8SAO3KJ++XWvDWuMU/h8ZGGLKmYxZ6lrHNEHZshFbA=; b=jk5opCxDYvg+OpOi7DsKan8Y9t/h/AH1xmNn9y0VMuXot0TOdBvmUnMxUrNar9Lki9 YLFC6+9KYVXZSKpIPcqcplUUCimNBBZ4tjWiK/XibW7UjOU/Lw57I1dZUhqk1sdR5Qwt XOPv53ueQJUPUPum6nwIuz1QfC27f7U6Og666Qje7uXcSQq1R5Zmcmv9psPvm+nyr8mb 61LM/HcRzP1capKNZtKjy2PMCPR6kBB2C2JSs8d+rJQ2Gbme3kaSw3djZ7xBcSnR98eX h9bOiGNhXEEygVVe/9LN7qE97zOyCWR7htM4s7aGg86oAcRrIPelNaeeTEh2o1nhmqjj aj8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158020; x=1747762820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q8SAO3KJ++XWvDWuMU/h8ZGGLKmYxZ6lrHNEHZshFbA=; b=qVF2GdeFoHaz+1mGncFQ4cJKo8gzZiebG99MP5zshvCY3RXEz9so2ipOtljnYaKB4E g8OEYGkXwWXgEq9MYH0w/u9LZBi8BB4kbI0tihgitgnfk+GRSg+/PyNOOHXud2xSptwb pX4fshroHLRX05kICcH977jX2ayfGnDTZqBr6kZLCkklUGoKmQlemqVry/WuA0/eQFhj XRSSmCq22rAJC4oRX4xlagk4H/QSDGrB+qRA3KO2nJjwU6ZIQmOt5rV4uySL59m7iecO LPptWZQUcgPScciWsfO1wiik2tPkyCdNiFs9OVGWTzWTcUTdPTh8XnXeDdaHh6hY36Kx FCEg== X-Gm-Message-State: AOJu0YygwHoA8JLFVc4Shf9RwycSv757omV7IHBJt4cLwSniyFyqIGSK gW2RhOkc9BzkeHmtqBSHoARgSHCeZ0OpZWvwtIYhj1aEN3G5t6ywvmL5eAClCySDeoXz4nnrCjg PjtY= X-Gm-Gg: ASbGncux+LRaBzM4y//vu3MbyrnvJ4tkeRVx6xULPDeUgAPT3yw9ho7qd5WW05LZ1Rv jsLjvjzcs84n3BE9fiehZZf4VM7ZDl6k5MXljPsEycx0K1MIRztngx9sUHmMdyLb8kwdr1gLBsv fyY9P/ZygeU59sExbTA6BLLu9nDDLOhbXpuMadhIEgXCxIBaTQFsymWOKj9TZvt9P+fiOaQLuP4 MbdVnLiclb+/Shl2spcxhSpwAbiPmKe33TAvuUR7H76r+lyAWbpgWoJ4eJ38fGdrSxHDPZnlr6B VWB+CYtoHvFlGR1SjYXKfksQl+qAl20GsqJgUuIpEIbkd6yI+Tc3cFVRuI4dTc2bKPCTbHsZJKV EpLAYoM/j4HxU2ZPxF5hkCmrswEKy X-Received: by 2002:a05:600c:5128:b0:43c:ec4c:25b1 with SMTP id 5b1f17b1804b1-442f2169795mr1791695e9.23.1747158019825; Tue, 13 May 2025 10:40:19 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d67ed1bcsm173216355e9.18.2025.05.13.10.40.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 10/19] hw/arm: Remove unnecessary 'cpu.h' header Date: Tue, 13 May 2025 18:39:19 +0100 Message-ID: <20250513173928.77376-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- hw/arm/exynos4210.c | 1 - hw/arm/highbank.c | 1 - hw/arm/mps3r.c | 1 - hw/arm/smmuv3.c | 1 - 4 files changed, 4 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 76001ff0dfc..56267ec2bd2 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "exec/tswap.h" -#include "cpu.h" #include "hw/cpu/a9mpcore.h" #include "hw/irq.h" #include "system/blockdev.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 3ae26ebebdc..5b2719555af 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -35,7 +35,6 @@ #include "hw/cpu/a15mpcore.h" #include "qemu/log.h" #include "qom/object.h" -#include "cpu.h" #include "target/arm/cpu-qom.h" #define SMP_BOOT_ADDR 0x100 diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index 48c73acc62e..889d291401e 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -29,7 +29,6 @@ #include "qapi/error.h" #include "qobject/qlist.h" #include "system/address-spaces.h" -#include "cpu.h" #include "system/system.h" #include "hw/boards.h" #include "hw/or-irq.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index ab679723533..37b39c9f84f 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -24,7 +24,6 @@ #include "hw/qdev-properties.h" #include "hw/qdev-core.h" #include "hw/pci/pci.h" -#include "cpu.h" #include "exec/target_page.h" #include "trace.h" #include "qemu/log.h" From patchwork Tue May 13 17:39:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889616 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2231749wrr; Tue, 13 May 2025 10:44:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVzI1tFQsRxu1P0MoW65Ozsn+6qSVTzdZBzPGwCAaXdWdXabmvtvdzXFE71OSHd/v6XNROuwA==@linaro.org X-Google-Smtp-Source: AGHT+IF7mDtpJG4nMXI5pBkvGd6kcx324geW4MFH250Q89cwhAr9QpNzdjFSzPFGeZoiUTu8Vykz X-Received: by 2002:a05:6214:2525:b0:6d8:9d81:2107 with SMTP id 6a1803df08f44-6f896e34f76mr4317996d6.20.1747158292957; Tue, 13 May 2025 10:44:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158292; cv=none; d=google.com; s=arc-20240605; b=QBQRyL4N5u0CYQtU/syFm+Ashma2X32f26wlq9nZDTCIfhJBFSOCd5s72+PALW8GDv 6E+tuHJDv0JRYJ3wT4bOISutuxaFX4HLWH3IwAqBhGDT1qlNOWk4yu/SGRAZvtq8cP1g qyj2xa3IAL2fSL3xTCcSPi9CM6kMiJii9a1snzlCDgY8UoQfoQ1M3UrfDfK2IuyfboQ4 2kV3rejbK2fMHgMCfKVKHFpEjB5KSNFL5IjVzhhdAZ/UVa0UVDLC/D2ca9bbE+jRq6lY s5jDsaM6DnvIZgcJ4GJvKmkk3uRNEmDTQCcHR/+5UNBU117EMyfIZVExoOsIQrdgPZr5 zVIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=92ChZ6jllY23UsU7xWSaP8Ezg849uhqSbkL7GZUJKKA=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=Y6BIygiOqkN8Zo7K6xQm76QNOeyBfQ18esLw1rRgoK9hk4iiJERTKygqCMtJ0Cm91l i+wxmDq9pZIggtGIz0UEJRSHzvFuAUqc3dZ9vvrakFp+Gnyt9Fx1w+w0OSxC5eZve0Th u8DaelhX2HmNJ6gOygZuc3zxkSp/leew1tVxVSNfJisbonJT+jE1R7cQ7Es3RFF2ni0q 3kACeDn1kBDg8fcAh0MdXhT0kduIgkx+d9rTHPwaauqF76/5cOwb2OCxbJKdgVwUQlnO xqQr+YjNE+CD3kj1+suERWc2E8NBWene4ModXrxTNR+0zg3e6M/Nwo9TMCZKSdGaovr6 tpcQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K5qP7nqS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e39e6f70si116224096d6.71.2025.05.13.10.44.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:44:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K5qP7nqS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtfw-0003Zs-9A; Tue, 13 May 2025 13:44:20 -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 1uEtcC-0000Mi-U4 for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:33 -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 1uEtcB-0003Ot-9T for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:28 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3a0b308856fso4358695f8f.2 for ; Tue, 13 May 2025 10:40:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158025; x=1747762825; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=92ChZ6jllY23UsU7xWSaP8Ezg849uhqSbkL7GZUJKKA=; b=K5qP7nqSsfpimFKRLUffM1g3YV1TFnyjuoQVwqaTdGPeFCbGBY3BI5mpepY6ole922 54gGNUEmpm5N6yQnwUAxK5Q+zT9G+cFjYfR3r07nLNK3ZMCZ0UQ3f4/g1qZb1LwhDhvM UYqI4Y3SG7wZCUbkwgGA1TDK6PIUYue0qhQQoK6H2HMbXlMZhq7x20MH9uzmz9/SGxPn siXSYtHHd7BlyQvNavV5Z9DQj9tKjCBQDxBKWJlL2d/ggjmhIF8KXPsUcmMtZI5JNz/f omZbnKzAdhJg+rlGzDldP089qXXOCq1Nz3VETalsPJOYJMJ56yCCIOJHSHy6dU2KUNOP GReQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158025; x=1747762825; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=92ChZ6jllY23UsU7xWSaP8Ezg849uhqSbkL7GZUJKKA=; b=PE3oVndeEYlHjIxcZX43kGArH7iV2A0i/39aRqHM4nRrdz98h5lpMRCSrJJpO43DIj h1DzHCn12Z0igOfWZ99LvBHqpoRmw/K9/yu6ZvSOwpMMqQis/VTHonU1sav3GNpUD18+ v15vQYfYR8ubQ2lhoiBHrOyeoNJbIT4UVIfSiDO8RWJz/AuAMbzx1Y20+LPNnkpsifok PQV4eZmfBSDYRWqqEb46kUFWRbIM3DAN8WVYl1HY6vTfJ1VroTEV4pCVSexPcPIxZC84 FQglMTyehNmxFLjKmxvue7cEWV6fFQDumSei8Q4uggoW9TWTERdMiYAEyIfcWVU8bAva mZrg== X-Gm-Message-State: AOJu0YyCXvGgUP2u/vI3QIxhWjVyibxcStD8RRP3EqYZXvbQBXrRPKVa VQGIBUsUPqT2pm4TxJgW5+4FB21VLVj+Rp4ymyaKB+AtU+5ICC0DWQjmRMaPCtGsxSaxmDTWu2Q d4+c= X-Gm-Gg: ASbGnctrrHokzjgnbvmmPbGTxz+kOoRNs1elex4Q0KGTqgFNhOc5xJ6w/uRwTWnEo2L Ij/lNkqXwQp61jJEb6bdrhO1MK49Z4RVrbxC+bJtQIY11GvNrggOY6rPvvlk3hq7OIs6eBj4kO3 M4FScTukQVwwQ+xHaXTc0oYQIQ8JB3MfmLv1hPu4eQilg+W2W0mAhMsnm2943TaCHKKwg2hB254 P4kU3FPbAGm7DhE1SzDMGPdDzonz4jpHiMm23QGTJ3vhMh8nPvQAp86ChaA70tTWQNsl3vBf9TL 6LuhcEmunQklKua44d8CKdxL2vRkS6o5DN1QegDPIc1Fsq1YPKmqUPB7v28Smotr9HdwByYA8SO sKFhJuWQI0cDMkk7dnjZJctEIYR43 X-Received: by 2002:a05:6000:22c2:b0:3a1:f561:6894 with SMTP id ffacd0b85a97d-3a34992266cmr132178f8f.44.1747158025410; Tue, 13 May 2025 10:40:25 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd3b7c89sm215849815e9.38.2025.05.13.10.40.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 11/19] target/arm: Restrict inclusion of 'multiprocessing.h' Date: Tue, 13 May 2025 18:39:20 +0100 Message-ID: <20250513173928.77376-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Only cpu.c requires "multiprocessing.h" definitions so far. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/cpu.h | 1 - target/arm/cpu.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 6ed6409cb7a..33ac0c9f818 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -30,7 +30,6 @@ #include "exec/gdbstub.h" #include "exec/page-protection.h" #include "qapi/qapi-types-common.h" -#include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" #define EXCP_UDEF 1 /* undefined instruction */ diff --git a/target/arm/cpu.c b/target/arm/cpu.c index a604e4ccac8..8c9d161f2ef 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -52,6 +52,7 @@ #include "cpregs.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" +#include "target/arm/multiprocessing.h" static void arm_cpu_set_pc(CPUState *cs, vaddr value) { From patchwork Tue May 13 17:39:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889633 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2235251wrr; Tue, 13 May 2025 10:52:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXxBYee5zcm2p+QWxe14eZ2b5zWPr8aS3wgCyfGn3XHVFdSIargrLXm8WSPuJjjMSHfkFrfhQ==@linaro.org X-Google-Smtp-Source: AGHT+IEptND+TSNPhjAB0bCeuShaQx/U2C+s3VmbYOEt0Q3sIJNKqe5uxcjBgTwRbf/rJeA2ulOJ X-Received: by 2002:a05:622a:4a0a:b0:476:923a:ca79 with SMTP id d75a77b69052e-49495c64b73mr5629201cf.7.1747158772313; Tue, 13 May 2025 10:52:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158772; cv=none; d=google.com; s=arc-20240605; b=Ter6dAViXU5SjBKrZ/RAOWFZufnZiCziVJq1D2lrzelxqXLbDdVP0N3pBE8m6Wm/DV tngAzBPubWo7cPWvCenPGnmEowk3XfIm4UXXYnVEcml4vvmeze3+9bF9CMsBzXSr6R3Q OIAamxtCnR0MIYhk27xZJbd6ca50Wg0GBbzxVvduRhVF0XLwsr6K2fMVfMov7myzJYfJ I91Lhs+oUika0wT6EwDW1WGnSdWQNgN1T17+pvu6Wjux5RVVdEF9+dWuhpmgzPWMDhmc X2RdXq8areElN29TEFQGu2l8pBHx18+W8Me/eeuoe9q/VYgD4KhCcXRSbYarQF27h4FX NUhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mOQr33THEcq0t4i2qfK/BB9LCYbfrT4uaAwTHlVrFMs=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=TctMImAHaEHz4qLH0xUpVEcNPvg4m6C++jQDiB4jSfSKm1HYCJ9S0ga4AE7zgOSOWt tb+6eZx2mFzE7kQ2GcwqMoLtAkiP8QrDvro4aCd0w3SEkvvjFgpACD8VbCAlIZ0s7PKP IumEB1x82OeJNZn5XGVIU8VGBjuKcxsHAzfrINuoxqzrfkcuPFRAAyjGMvZ2REoe5HX1 //+T79yucPAH7N0EjMNLwGJ9cQNNaN7+SHyE5YHrMXGtNuIHyEGKJq65qhM9xvzqUn85 tCn4B3Y+weIdVqf3BldtIKO9dqaqM7azlmj2B/mFGWHfA1WnbHBE2+xvvRXTAFKqZydS xRtg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=phrswJal; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494525b4098si112079521cf.645.2025.05.13.10.52.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:52:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=phrswJal; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtnj-00015N-3k; Tue, 13 May 2025 13:52: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 1uEtcI-0000PF-CY for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:36 -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 1uEtcG-0003Pa-CR for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:34 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3a1fa0d8884so2782556f8f.3 for ; Tue, 13 May 2025 10:40:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158030; x=1747762830; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mOQr33THEcq0t4i2qfK/BB9LCYbfrT4uaAwTHlVrFMs=; b=phrswJalDLMHHbOAWS9yMlaQnLeJj40ph9Rhac7dD0ylVM1LF2VnkFS0ljMo+lhxfI JfgpmN0xLteCgpDNw6iWChINhQ2MCn/QHDzABJakbOCcYE2uPongkdwNHsPsbnyRUvRy yB0sf/NF7Okj9z4xNirWVLtU6awRqKpIqzGInBWiSXJLSpXGPf2NhjrUVDPIJDEJjipU PCVAMmUyE27ORMpm5mq2PU8TdB8HNO+gjV4ezLSKseVyOF5sNCmBWNgdUVk1dtGuxrKH w/2sHHHMUyzJko7hoVJNahvUbO+vPmcnuV4PmIh9an1ePdnjz3ocFj8oWOmuHRhQheFr qGYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158030; x=1747762830; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mOQr33THEcq0t4i2qfK/BB9LCYbfrT4uaAwTHlVrFMs=; b=B/UyP1SoP/Liastj0TDSHx4+ob7a2L84gS4K6dLU4RkM3dWQALpRtxj3hdTmC7DfCM SFus++h6PWKKP9c3+hm1e/lzt0nMn830PcN//3a5YjAfcP3NET4bWkOcrxIj14asxVAz afqV0pbou8raPdLTStugnIHoULjiAC94il6fsVX9WucxeXPZxAnEKARp2kg1SXu4Yg2j ce03Mf5IVnSX/rnWdCLQ8SRlGRsuqfLJ0SQnPf3Sq9kzAfnmH0uNcZVAYIEMFFT8ik/m NKl2nQIfKIWofEPtnPcriHnAZhB//uoCBrE88m1Z5sp3tlq5PzNut0a5XQZmGIMjsfic +Gsw== X-Gm-Message-State: AOJu0YwF19YYzZdLPWaVlArevM7d3HEBCTYsLELyB2X+JP6A2fITN9pT a+V9aESl61RfNYsXuIEXgBXUnfrteCImEseYlSdlBP6Ob5W7r+X4q5LfgQKb2NpU7EGcd7hyKbp 8/gM= X-Gm-Gg: ASbGncvcDTUtNzmzkwvHDhLzN4FyFC4raV6EnVojzBX7dHFsc2Y4HJv5tokiBF29BSe fKcX9QGwj+qLDKFLJcLIIP3RymE+z266emj2zKas/Tol9AADlsM6Jdh6jk7khjKsE3bDH6pLSHj mPHOAATkOI74z00qTJeGBRpRcrgVMoELI7RNbq6ozI85p6f2yrkwAxxCopkC+1qD3pp/0SJbupy XMTFiwchVW04ktc5aC1Lf41LeA4jOCL2C/VRVR5vdTGuN3v69V8taYjY0kNVcdAm2wA6jASbIef en5sbW2koGJm1ZVlacjH3ifEnC4TxAykNuzZJ2o+Rh7qMhOeQ4lx62grVWMdluNMC6QQGEYsBL8 1C4gJrzQXydqFOTHCnyKHp2ICtpNM X-Received: by 2002:a5d:68d2:0:b0:3a0:9705:eb13 with SMTP id ffacd0b85a97d-3a34991e9a6mr113074f8f.43.1747158030224; Tue, 13 May 2025 10:40:30 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f2a1dsm16527595f8f.43.2025.05.13.10.40.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 12/19] target/arm: Move some definitions from 'cpu.h' to 'multiprocessing.h' Date: Tue, 13 May 2025 18:39:21 +0100 Message-ID: <20250513173928.77376-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org arm_build_mp_affinity() and affinity mask definitionss are related to multiprocessing. Move them to "multiprocessing.h", including this header when necessary. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/cpu.h | 17 ----------------- target/arm/multiprocessing.h | 18 ++++++++++++++++++ hw/arm/aspeed_ast2600.c | 1 + hw/arm/aspeed_ast27x0.c | 1 + hw/arm/exynos4210.c | 1 + hw/arm/npcm8xx.c | 1 + hw/arm/sbsa-ref.c | 1 + hw/vmapple/vmapple.c | 1 + target/arm/kvm.c | 1 + 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 33ac0c9f818..b70c7a3ecd2 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1155,23 +1155,6 @@ void gt_rme_post_el_change(ARMCPU *cpu, void *opaque); void arm_cpu_post_init(Object *obj); -#define ARM_AFF0_SHIFT 0 -#define ARM_AFF0_MASK (0xFFULL << ARM_AFF0_SHIFT) -#define ARM_AFF1_SHIFT 8 -#define ARM_AFF1_MASK (0xFFULL << ARM_AFF1_SHIFT) -#define ARM_AFF2_SHIFT 16 -#define ARM_AFF2_MASK (0xFFULL << ARM_AFF2_SHIFT) -#define ARM_AFF3_SHIFT 32 -#define ARM_AFF3_MASK (0xFFULL << ARM_AFF3_SHIFT) -#define ARM_DEFAULT_CPUS_PER_CLUSTER 8 - -#define ARM32_AFFINITY_MASK (ARM_AFF0_MASK | ARM_AFF1_MASK | ARM_AFF2_MASK) -#define ARM64_AFFINITY_MASK \ - (ARM_AFF0_MASK | ARM_AFF1_MASK | ARM_AFF2_MASK | ARM_AFF3_MASK) -#define ARM64_AFFINITY_INVALID (~ARM64_AFFINITY_MASK) - -uint64_t arm_build_mp_affinity(int idx, uint8_t clustersz); - #ifndef CONFIG_USER_ONLY extern const VMStateDescription vmstate_arm_cpu; diff --git a/target/arm/multiprocessing.h b/target/arm/multiprocessing.h index 81715d345c2..8eec79b11d8 100644 --- a/target/arm/multiprocessing.h +++ b/target/arm/multiprocessing.h @@ -11,6 +11,24 @@ #include "target/arm/cpu-qom.h" +#define ARM_AFF0_SHIFT 0 +#define ARM_AFF0_MASK (0xFFULL << ARM_AFF0_SHIFT) +#define ARM_AFF1_SHIFT 8 +#define ARM_AFF1_MASK (0xFFULL << ARM_AFF1_SHIFT) +#define ARM_AFF2_SHIFT 16 +#define ARM_AFF2_MASK (0xFFULL << ARM_AFF2_SHIFT) +#define ARM_AFF3_SHIFT 32 +#define ARM_AFF3_MASK (0xFFULL << ARM_AFF3_SHIFT) +#define ARM_DEFAULT_CPUS_PER_CLUSTER 8 + +#define ARM32_AFFINITY_MASK \ + (ARM_AFF0_MASK|ARM_AFF1_MASK|ARM_AFF2_MASK) +#define ARM64_AFFINITY_MASK \ + (ARM_AFF0_MASK|ARM_AFF1_MASK|ARM_AFF2_MASK|ARM_AFF3_MASK) +#define ARM64_AFFINITY_INVALID (~ARM64_AFFINITY_MASK) + +uint64_t arm_build_mp_affinity(int idx, uint8_t clustersz); + uint64_t arm_cpu_mp_affinity(ARMCPU *cpu); #endif diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index d12707f0abe..62a9200dac6 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -17,6 +17,7 @@ #include "net/net.h" #include "system/system.h" #include "target/arm/cpu-qom.h" +#include "target/arm/multiprocessing.h" #define ASPEED_SOC_IOMEM_SIZE 0x00200000 #define ASPEED_SOC_DPMCU_SIZE 0x00040000 diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index 1974a257660..a38c2a19751 100644 --- a/hw/arm/aspeed_ast27x0.c +++ b/hw/arm/aspeed_ast27x0.c @@ -22,6 +22,7 @@ #include "hw/intc/arm_gicv3.h" #include "qobject/qlist.h" #include "qemu/log.h" +#include "target/arm/multiprocessing.h" #define AST2700_SOC_IO_SIZE 0x01000000 #define AST2700_SOC_IOMEM_SIZE 0x01000000 diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 56267ec2bd2..e83a88d3369 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -36,6 +36,7 @@ #include "hw/sd/sdhci.h" #include "hw/usb/hcd-ehci.h" #include "target/arm/cpu-qom.h" +#include "target/arm/multiprocessing.h" #define EXYNOS4210_CHIPID_ADDR 0x10000000 diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c index d7ee306de7a..e6c16537eef 100644 --- a/hw/arm/npcm8xx.c +++ b/hw/arm/npcm8xx.c @@ -29,6 +29,7 @@ #include "qapi/error.h" #include "qemu/units.h" #include "system/system.h" +#include "target/arm/multiprocessing.h" /* * This covers the whole MMIO space. We'll use this to catch any MMIO accesses diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index deae5cf9861..25ffb029ff4 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -52,6 +52,7 @@ #include "qom/object.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" +#include "target/arm/multiprocessing.h" #define RAMLIMIT_GB 8192 #define RAMLIMIT_BYTES (RAMLIMIT_GB * GiB) diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 16e6110b68f..47f23b6e2c0 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -51,6 +51,7 @@ #include "system/reset.h" #include "system/runstate.h" #include "system/system.h" +#include "target/arm/multiprocessing.h" struct VMAppleMachineState { MachineState parent; diff --git a/target/arm/kvm.c b/target/arm/kvm.c index a08a269ad61..5969249b579 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -39,6 +39,7 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/ghes.h" #include "target/arm/gtimer.h" +#include "target/arm/multiprocessing.h" #include "migration/blocker.h" const KVMCapabilityInfo kvm_arch_required_capabilities[] = { From patchwork Tue May 13 17:39:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889635 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2235519wrr; Tue, 13 May 2025 10:53:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXw1Yh6tT5Vhtnc41m1ow2tO2KGCQ6VxGNKMeLIgjYy+j4nWT5O2rAWVGPcp7EftYsNy1p7Lw==@linaro.org X-Google-Smtp-Source: AGHT+IEwILUYfo0d//QnPw5REutI0Zg/NNhn1loWTc8v8RhTXZAywKhnT2G888nRKxsLK9VyRXE/ X-Received: by 2002:a05:622a:260a:b0:47a:e7d4:455b with SMTP id d75a77b69052e-49495ce2b8emr6287641cf.47.1747158807916; Tue, 13 May 2025 10:53:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158807; cv=none; d=google.com; s=arc-20240605; b=Nt+rQ9JyJP05yMuQykvUa+DadICKq7EIUUM+8KPnm7Gi8Bx1FYMtRUsknIy0KmzS+T L4cC3Gf/v/rifqwVAkjN5ho3ktB/gK+z0Q8+TtnnmYlfhBuZQ1+Pd7XX0da04ldO6Zc7 xfssUMY8KSedO+zhqX9LiPb2bK5cPrnxyckFob1mlNIyCbLMPg8wNXClbd1TETLROsBr oPgfS/cUb+YWwM+til7avO35vvwTX+b7tTrdh4DmawKO/JsmynlPgfFiwj67fJPVwkzx byUV9dffb0Wqv2GNpGq/ERC5Si4TF9az6njDuHwgpngj6cbnviymtFDLpvKLuZRB7+oA m3jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rbZkU9N2W70mmJR5tu1c9TOXd68jr3evYSE4eI0rwy4=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=Lax3xmXabdbPJo8rKmBIyJYwb75994C1zeGwfqpslZ1v1vIIGUVty+I2wS5gM06D8n u5E8y+C8KSR6gvl90Qn6ybGfY57aKPiwMtxiXdxmIRe9KW9xLWLfKTU/Fxox0C8+UX8a V2Uw/IpFVPIRTgQD/xhK/YMN8+Jspyk2BlrMVWmWQuEVaYequnE07G1qaW7ruZ+2uNgB qi+A9FH9lkoyOTWesfx9mP/fk/oNcXRstHSTqtJfDDe8SspgfDRDv21XU93WXjEDxiwg n6JJ3KAVYUqAUCx2MGgKt+ZXg2F6i7YjbZXFBYpNVsXUXaPr4prpI+Vdkdck9Ivy7CXp OVWQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KYEDzG5B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494525b3b50si110638661cf.665.2025.05.13.10.53.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:53:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KYEDzG5B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEto6-0001b3-8B; Tue, 13 May 2025 13:52: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 1uEtcN-0000V1-54 for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:40 -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 1uEtcL-0003Pw-8T for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:38 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43edecbfb94so60863045e9.1 for ; Tue, 13 May 2025 10:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158035; x=1747762835; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rbZkU9N2W70mmJR5tu1c9TOXd68jr3evYSE4eI0rwy4=; b=KYEDzG5B79szxCqqIK1YlbABlWYoXX5ubDAmC7T50qmDSYaJhg3qRAa7T5eXtgrfl+ i6a9m+s+cmlngSYMhSWExJXr819QJc48jJuqp/91NyjOwTYDK0OkwKVxt5cbtHc2nvgD r4QIv1U5DG+y16Kh68n3AE2MmiSPr/97Sa1ScQCJTR6Rwy8U+VqeH+XJ/iao/ctUTCaU adKxvFBiaUIa4aTASDGHknjvEroVJybS45EzZz3XC9oxL1pLHqI59gZNZ/EP5xwyzgKQ 9yIBBACNfx/j9xEWxwTbS5wjbF1JGBMnfwIQDgS7IZcz5/Wr7EIOpjlfWvB/G5l17K11 Z1tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158035; x=1747762835; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rbZkU9N2W70mmJR5tu1c9TOXd68jr3evYSE4eI0rwy4=; b=YLWBFiGZfoTogM/tJiR0ENED9IsA5qqXYJixvuScpu39iKXgPzbqZKrYvk86C9kOVy 3iPKUAOv2cmYeUCKSpiOjpyJlmz4J3coz3blGoROeE5mCRn6D5DjklZ2+WT4yG+HHg0L 2WyXl7OBMhZINLwDmrKsC48qHLbtUrBKp9pX2isfzWywR2eH5khtyEB39zRqJUVjnDR9 Je1uYxthfbxuA7t23w4PbDb6GjddBEg72zdtqT+DmS9Wa7n9ueD3RJmxl4jLEBwJkwY0 Ou5yarPoYMNueAnnhl1h9LiiB+lA6NpCpDJv1mJMGOFIi4Kh+z0orKMoSGR5sp+bCt/V TtBA== X-Gm-Message-State: AOJu0YxRrAfyU7F55ZVD57jFBYOnKimJ0CFJGcHyhhtmFYLnA6HJ7B0R BvThfS7itBbSCIin9jkwUBrH2grWia+mlTk0eoHG6PckGLBt3Jglps7AkStEI9EeF0cfqiIgrcu ybrY= X-Gm-Gg: ASbGncvGoOjDFWSvkgPWCHvx0LprpZ2Yav4OsKUCuFO8eytpWvGJfisYVqfmsvHyUBU eGi3qxiRdoDB9i2w6VWKO+QAVm/ggBuxAB315lsQhaNUXAyNbNpJw6N/c2UqJZVJMofE1ot4Mj8 RYbolJZnF+6Lqs3dTpcYk8lhZGDHm2QP6nfwgfT5+6EEWT+sGl7+aEbYIBffridrCXij9zcs4QV hgZqfuIr7GjjhwAWneBy56RVIgUQEPZFm3U3DuoJoz0JiU2YK53h2vdg6iADANIVD3raoXoUZMS C7OKXUiJDNSn9W03lFZD3gJQv9d28eSdMqCx8dNHuIkvMgpr2UMYCSE8xJojduBHown5mTIGR6d vkK1u3rCZWKjT1o7Z1nwdrY9wnX5w X-Received: by 2002:a05:600c:358b:b0:442:e9ec:4654 with SMTP id 5b1f17b1804b1-442f20e1ad3mr2562725e9.8.1747158035045; Tue, 13 May 2025 10:40:35 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d14e6d74sm206848455e9.21.2025.05.13.10.40.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 13/19] hw/arm: Include missing 'target/arm/gtimer.h' header Date: Tue, 13 May 2025 18:39:22 +0100 Message-ID: <20250513173928.77376-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- hw/arm/aspeed_ast27x0.c | 1 + hw/arm/bcm2838.c | 1 + hw/arm/exynos4210.c | 1 + hw/arm/fsl-imx8mp.c | 1 + hw/arm/mps3r.c | 1 + hw/arm/npcm8xx.c | 1 + hw/vmapple/vmapple.c | 1 + target/arm/tcg/op_helper.c | 1 + 8 files changed, 8 insertions(+) diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index a38c2a19751..ad017237f3f 100644 --- a/hw/arm/aspeed_ast27x0.c +++ b/hw/arm/aspeed_ast27x0.c @@ -22,6 +22,7 @@ #include "hw/intc/arm_gicv3.h" #include "qobject/qlist.h" #include "qemu/log.h" +#include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" #define AST2700_SOC_IO_SIZE 0x01000000 diff --git a/hw/arm/bcm2838.c b/hw/arm/bcm2838.c index 22aa754613c..20709bf19e8 100644 --- a/hw/arm/bcm2838.c +++ b/hw/arm/bcm2838.c @@ -12,6 +12,7 @@ #include "hw/arm/raspi_platform.h" #include "hw/sysbus.h" #include "hw/arm/bcm2838.h" +#include "target/arm/gtimer.h" #include "trace.h" #define GIC400_MAINTENANCE_IRQ 9 diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index e83a88d3369..24b3c0b5d29 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -36,6 +36,7 @@ #include "hw/sd/sdhci.h" #include "hw/usb/hcd-ehci.h" #include "target/arm/cpu-qom.h" +#include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" #define EXYNOS4210_CHIPID_ADDR 0x10000000 diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c index 23e662c16ca..3528adb90f1 100644 --- a/hw/arm/fsl-imx8mp.c +++ b/hw/arm/fsl-imx8mp.c @@ -17,6 +17,7 @@ #include "hw/boards.h" #include "system/system.h" #include "target/arm/cpu-qom.h" +#include "target/arm/gtimer.h" #include "qapi/error.h" #include "qobject/qlist.h" diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index 889d291401e..8c743be3cb5 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -47,6 +47,7 @@ #include "hw/ssi/pl022.h" #include "hw/timer/cmsdk-apb-dualtimer.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" +#include "target/arm/gtimer.h" /* Define the layout of RAM and ROM in a board */ typedef struct RAMInfo { diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c index e6c16537eef..7802768c384 100644 --- a/hw/arm/npcm8xx.c +++ b/hw/arm/npcm8xx.c @@ -29,6 +29,7 @@ #include "qapi/error.h" #include "qemu/units.h" #include "system/system.h" +#include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" /* diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 47f23b6e2c0..2dc5e15e791 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -51,6 +51,7 @@ #include "system/reset.h" #include "system/runstate.h" #include "system/system.h" +#include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" struct VMAppleMachineState { diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 575e566280b..073a8319fa5 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -25,6 +25,7 @@ #include "cpu-features.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" +#include "target/arm/gtimer.h" #include "cpregs.h" #define SIGNBIT (uint32_t)0x80000000 From patchwork Tue May 13 17:39:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889626 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233654wrr; Tue, 13 May 2025 10:49:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFSb019m/LuVtmJnh0QH3+PYCYm8SHaICsQS2vT38hbUcKDW/HrdhXYSaGztm27OxbdfaWHg==@linaro.org X-Google-Smtp-Source: AGHT+IHtIr4ILxnqbFo7JjrjKmHmlXXiUF9RvZHxaZou3RawVBjTjSJ+cCdflc5Iip1Uy/jKUEm0 X-Received: by 2002:a05:622a:4a8a:b0:476:a03b:96ec with SMTP id d75a77b69052e-49495d0213emr6407181cf.32.1747158550748; Tue, 13 May 2025 10:49:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158550; cv=none; d=google.com; s=arc-20240605; b=fsfqQtuWr3f+jvxeNL4UIDyeFTv+v2ujklgnSGkKzIb23BAX5AtzhpMWwIy3+CRfCc z66QBWuJOOdXWpTLATgOsYI5zXIaOrEMsQweqa6aK/byiCZqEQ/50Vf9MyxL0gv0brCq KOvun2nDPOlWa8IXP4lZJhNAS3L5n1fPwxYDLlEBV+IDQJg9ywjQP4UeVz93upgscVa/ qSiGkH174nVU/NrhSQqG6wyL/Z0z3EpkTAXPYHPvlQvSVM5VOOoFZXIW/fx2CKxsbqnG 7hB9+da6LfQjZdCF1KVf1P3854Kzfuq7inZKHYButu00RLBfDeXIOzLbtfQxMk5P9pBw 888A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=neloj2ajHaqhmJKWG5e1yATLyBo4rGwFX0cyyLIOZTY=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=iKOHVypNMlM39F90gcJaRskud0tBnsBcZbehQGmJXdl50cBlfppoPqIZmvCiWXH82T N0bhtWEwr3hs9cj1A5WC/Q84BTeXNNPeVtIazK8HtqAwIbDyvkMYQwtlv26BLC4xi5NT DTGX1Zs1kHl7Q88DrhMkYFtIkMIPqpYMr18qXRZID2Her5j+zO4AxjWrNi41bx5gw5rz JgoCUs6mASwCW8nexMcpyjgQHnUc2vWzuSaNfB/umZXKFm+t1VqHa6uSRwS78DMXPvLu L0XiZe0QBDAWOyKqQ3+g7vTVNxpcDRzRQvHiSO/gTJiU09aZvaIjdqgRGdTXX34+M0jW vMzg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bfREviDu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49452479c0esi112428731cf.178.2025.05.13.10.49.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:49:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bfREviDu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtk9-0001Ix-Uf; Tue, 13 May 2025 13:48: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 1uEtcS-0000bn-FA for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:44 -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 1uEtcP-0003QW-Qd for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:44 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-442d146a1aaso54373145e9.1 for ; Tue, 13 May 2025 10:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158040; x=1747762840; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=neloj2ajHaqhmJKWG5e1yATLyBo4rGwFX0cyyLIOZTY=; b=bfREviDu+0i//TdpfEOa3kEuqEgEEx92hYoR+mTs7hADq8ebbP/bN+EmmLIXxnDC/+ E43p1ZlXPdpjwKQUY7HlQoo4rMa94XTJ67fSk9VTDmmNcdWKueIrrS9nA0y8zEKTCIxq iMt9xtGZrwu+PS6PXehK5M+7fyEBGq9Tk1ycO5w3Zfs0irEjsi1SAPIq7UZaLPEvjOY8 UOLmFcRbNx2LLcq2/H5sc96NVNPfcQ7kdMQRRcw51TmBbaPPUwW306INPTzQPG7Z4ba5 ftloINI86oMffxfPes+AjPKAG3zucXBoHxzIQyJc3fJsBtd8/f8mU0GkLQWH3ZipA0X6 FWzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158040; x=1747762840; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=neloj2ajHaqhmJKWG5e1yATLyBo4rGwFX0cyyLIOZTY=; b=KuJBOYSlOl56NVfrHpmQtfdGZ6nzBZzTQqGIMOCujEmZ1qYPHIJf90yxN5N6XLCffd Xcccuy5ZGE2nge0xSo0ZOmM8RlfsZ+ns4zxF5Gsi5lBDALysXhflfUFyzty9tJwMBM4b iAIFpqp4jYOVER/wQRvsgPnRi7sHe1DMJnd5XTsrRogx+qhzcBLjMiOR6knENaVGc0nK 8vm6HqP6PlQvZTYune2g0mkDqMzK/VqNnAFma5GGcrc5Lo4DOFNGZRMDM7YBNVtr1NJk r8RbWTsZ0r4HmyUtmERXMuz9UihT6ahU5xmeTM1M4i3ROKlwlsOdR30TiPUoWmnZRts3 oqBg== X-Gm-Message-State: AOJu0YzTabLpYvMkKvjF5UWvEiZ+gbqJXzWziRT8HUZsq16ZIuoD5LlW Rn7Ek0SQiDKgz+2cgyvYYE+TvJrgQQjsL2xPNSGq9DLUtxgHHqDyFkmSBe9oGygCGTM86MqAHrF tG7I= X-Gm-Gg: ASbGncuFRgVfUULcybPc1qnFWriHxTftQI6lCywGjBO+HZJCp2u4qMKgX/SSFbi67Af wgZXUU9Vp6xyk5SjqJm3M3H3Dz87yC4NvchtyscsjPLEbBV/U0Ckb7ZX1gEYnyjJKd6aDk85k9G D1hGz3a6ftC3pjd8wpFUeKESL7sBu4c9PdYw5g9br9ccfZ592nKeuHoNSEhjN5PWmZFtGR6ZayO wSskVNZWt6Gcw2SSloyjICowGCiozVpAakTxP3mLrsEFm6Bm4hg0malTRSKNKJ9XoUdTBeZTcLO Co6jkDTfhk41LYfUW6Jli4LLPcHf2P6wHbJ998UCcjKULbbwt4E3XU4/a5e3ygD9AkyFdDk5leQ tMkAhnPTNOVmt1Cc1xfyUppR1jsiO X-Received: by 2002:a05:600c:3e88:b0:43c:ec28:d31b with SMTP id 5b1f17b1804b1-442f20db116mr2935415e9.10.1747158039949; Tue, 13 May 2025 10:40:39 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d67d5c09sm178270065e9.7.2025.05.13.10.40.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 14/19] target/arm: Extract PSCI definitions to 'psci.h' Date: Tue, 13 May 2025 18:39:23 +0100 Message-ID: <20250513173928.77376-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Extract PSCI definitions (which are not target specific) to the new "target/arm/psci.h", so code from hw/arm/ can use them without having to include the target specific "cpu.h" header. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- include/hw/arm/boot.h | 3 ++- target/arm/cpu.h | 7 ++----- target/arm/psci.h | 18 ++++++++++++++++++ hw/arm/bananapi_m2u.c | 1 + hw/arm/boot.c | 1 + hw/arm/highbank.c | 1 + hw/arm/imx8mp-evk.c | 1 + hw/arm/mcimx6ul-evk.c | 1 + hw/arm/mcimx7d-sabre.c | 1 + hw/arm/orangepi.c | 1 + hw/arm/sbsa-ref.c | 1 + hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 1 + hw/arm/xlnx-versal-virt.c | 1 + hw/arm/xlnx-zcu102.c | 1 + hw/vmapple/vmapple.c | 1 + target/arm/helper.c | 1 + target/arm/hvf/hvf.c | 1 + target/arm/tcg/op_helper.c | 1 + target/arm/tcg/psci.c | 1 + 20 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 target/arm/psci.h diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index b12bf61ca81..648fdb88862 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -12,6 +12,7 @@ #define HW_ARM_BOOT_H #include "target/arm/cpu-qom.h" +//#include "target/arm/psci.h" #include "qemu/notify.h" typedef enum { @@ -100,7 +101,7 @@ struct arm_boot_info { * as the conduit specifies calls should go to (eg guest firmware booted * to EL3) then PSCI will not be enabled. */ - int psci_conduit; + int psci_conduit;// /* Used internally by arm_boot.c */ int is_linux; hwaddr initrd_start; diff --git a/target/arm/cpu.h b/target/arm/cpu.h index b70c7a3ecd2..116745975fa 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3098,11 +3098,8 @@ static inline bool bswap_code(bool sctlr_b) #endif } -enum { - QEMU_PSCI_CONDUIT_DISABLED = 0, - QEMU_PSCI_CONDUIT_SMC = 1, - QEMU_PSCI_CONDUIT_HVC = 2, -}; +void cpu_get_tb_cpu_state(CPUARMState *env, vaddr *pc, + uint64_t *cs_base, uint32_t *flags); #ifndef CONFIG_USER_ONLY /* Return the address space index to use for a memory access */ diff --git a/target/arm/psci.h b/target/arm/psci.h new file mode 100644 index 00000000000..8b868dfbb91 --- /dev/null +++ b/target/arm/psci.h @@ -0,0 +1,18 @@ +/* + * ARM Power State Coordination Interface (PSCI) definitions + * + * Copyright (c) 2003 Fabrice Bellard + * + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#ifndef TARGET_ARM_PSCI_H +#define TARGET_ARM_PSCI_H + +enum { + QEMU_PSCI_CONDUIT_DISABLED = 0, + QEMU_PSCI_CONDUIT_SMC = 1, + QEMU_PSCI_CONDUIT_HVC = 2, +}; + +#endif diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index b750a575f72..61e01a38099 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -27,6 +27,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-r40.h" #include "hw/arm/boot.h" +#include "target/arm/psci.h" static struct arm_boot_info bpim2u_binfo; diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 79afb51b8a5..b81a850819b 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -29,6 +29,7 @@ #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/units.h" +#include "target/arm/psci.h" /* Kernel boot protocol is specified in the kernel docs * Documentation/arm/Booting and Documentation/arm64/booting.txt diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 5b2719555af..0ce39877822 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -36,6 +36,7 @@ #include "qemu/log.h" #include "qom/object.h" #include "target/arm/cpu-qom.h" +#include "target/arm/psci.h" #define SMP_BOOT_ADDR 0x100 #define SMP_BOOT_REG 0x40 diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index b3082fa60d8..81fe0361ea7 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -15,6 +15,7 @@ #include "system/qtest.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "target/arm/psci.h" #include static void imx8mp_evk_modify_dtb(const struct arm_boot_info *info, void *fdt) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 86982cb0772..be5e50abf17 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -18,6 +18,7 @@ #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" +#include "target/arm/psci.h" static void mcimx6ul_evk_init(MachineState *machine) { diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 33119610113..e0f25b92594 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -20,6 +20,7 @@ #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" +#include "target/arm/psci.h" static void mcimx7d_sabre_init(MachineState *machine) { diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index e0956880d11..99037a09a36 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -26,6 +26,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" +#include "target/arm/psci.h" static struct arm_boot_info orangepi_binfo; diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 25ffb029ff4..d5ce15b688f 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -53,6 +53,7 @@ #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" #define RAMLIMIT_GB 8192 #define RAMLIMIT_BYTES (RAMLIMIT_GB * GiB) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 7e8e0f0298d..20dc93fbc54 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -59,6 +59,7 @@ #include "hw/acpi/viot.h" #include "hw/virtio/virtio-acpi.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" #define ARM_SPI_BASE 32 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9a6cd085a37..d110cb07943 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -79,6 +79,7 @@ #include "target/arm/internals.h" #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" +#include "target/arm/psci.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" #include "hw/acpi/generic_event_device.h" diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index adadbb72902..7e1b93b782d 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -21,6 +21,7 @@ #include "hw/arm/xlnx-versal.h" #include "hw/arm/boot.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" #include "qom/object.h" #define TYPE_XLNX_VERSAL_VIRT_MACHINE MACHINE_TYPE_NAME("xlnx-versal-virt") diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 14b6641a713..c46bf11ce24 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -26,6 +26,7 @@ #include "qom/object.h" #include "net/can_emu.h" #include "audio/audio.h" +#include "target/arm/psci.h" struct XlnxZCU102 { MachineState parent_obj; diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 2dc5e15e791..b61f5ea51a4 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -53,6 +53,7 @@ #include "system/system.h" #include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" struct VMAppleMachineState { MachineState parent; diff --git a/target/arm/helper.c b/target/arm/helper.c index 76312102879..7859729c39f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -34,6 +34,7 @@ #endif #include "cpregs.h" #include "target/arm/gtimer.h" +#include "target/arm/psci.h" #define HELPER_H "tcg/helper.h" #include "exec/helper-proto.h.inc" diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 42258cc2d88..8fbd4c4be59 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -33,6 +33,7 @@ #include "target/arm/internals.h" #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" +#include "target/arm/psci.h" #include "trace.h" #include "migration/vmstate.h" diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 073a8319fa5..e0f9c91450a 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -26,6 +26,7 @@ #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" #include "target/arm/gtimer.h" +#include "target/arm/psci.h" #include "cpregs.h" #define SIGNBIT (uint32_t)0x80000000 diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c index cabed43e8a8..0313cdd6ba2 100644 --- a/target/arm/tcg/psci.c +++ b/target/arm/tcg/psci.c @@ -25,6 +25,7 @@ #include "internals.h" #include "arm-powerctl.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" bool arm_is_psci_call(ARMCPU *cpu, int excp_type) { From patchwork Tue May 13 17:39:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889627 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233680wrr; Tue, 13 May 2025 10:49:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVLVXs9xLJc4CLibTjbbnCheA/7q7zxfA0SQq7tqgS6ttligqXWlaKZnqm8A3vnLVCEwWEtFg==@linaro.org X-Google-Smtp-Source: AGHT+IGqO9qLIxCUEO+8Xg6QolAMBoRg30UUYppo0z54gHG2avTxTr13yfSIeG3O35rSYJGL00Mr X-Received: by 2002:a05:622a:1f9a:b0:48a:582a:64de with SMTP id d75a77b69052e-49495c61e14mr5594961cf.7.1747158543586; Tue, 13 May 2025 10:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158543; cv=none; d=google.com; s=arc-20240605; b=Ex/NV3+P8tE/aXPm0TRFRzDqlrtFw/hpKGfoUnqmrafxe7zSznYIdcgCJXPSf+i+21 FeLeQRf/klNkEx/x9Go6MZFirVak9sNmWc+zHyPKu7kppTQqmdjd2kOI4qWk1F6f5GGi fQFmkoBwYBq8KUJ4xdiznV+E2hQoGyuo+PhKa90huZ1GGR7EmP0PSpbJvVQI0SS9zPxs x1AQlrQcZtTDCIxtS+Whv1Fz4Skh7MXL521r20I3Kpb8bNpY3XNJTxNVlGIq2nY+7pF5 XgzWKVhMJMx0bH+1mVHMi0m9Tq+1lDUZKu/B0AUHw+kjH47SLKm60QYQpzhhumkT1XHA HATg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NiBLsAOib2fbx3En55zCnPHZz2Kn8ay16k8dNjN2Wz8=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=NahVaMV/EmLEgvEbzYuPKvUzl+4xMSjH4POkFJxv25CQ2cbyVusHiFrIsXL295xx60 +uTjmSkdtPrPEjAOnjdsW9NFPyldPWYXCpJmnYh88yeYfkBT0jo7AwHiDj9uD7zWXnFZ RzhC/vaZss4jqUJAEV4JEvwAr6DaIajP5ygwckgNKSdmIob1P59Rm4BU/SK7hbNBe9UY EZrfBt0cXPVsBrTbUg8xxU26zRh4Gy7fd7BAFDDXecSS3bNmiAsj0LKrxUV7pwVo8ESy QedUECkWA2OK0+ySTeCJoYc05YvrnM26I9BckRWS0bnATapiQr+blFtPtwc7zH5brZFn J79g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=abDMiwXi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4945259df58si113055181cf.584.2025.05.13.10.49.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:49:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=abDMiwXi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtkM-0002AW-Vs; Tue, 13 May 2025 13:48: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 1uEtcW-0000gf-Jw for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:01 -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 1uEtcU-0003Qu-NC for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:48 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-442eb5d143eso9469955e9.0 for ; Tue, 13 May 2025 10:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158045; x=1747762845; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NiBLsAOib2fbx3En55zCnPHZz2Kn8ay16k8dNjN2Wz8=; b=abDMiwXisWF1xKskxqYVOY1ve3+C9vkFl/okwjZp0XxVMYetviuw6nUJ4ZGpzlcNRN vDOn6mg76XTK56HmlgkcWYtHdrxueSs/9ygt0QrsRzcsZSJg9ZKYkTyMSt2J/ufMEmb3 YDRekKHerq+LYfBF6IATOI80Plp8f/J6Y+4sT7Cy3zmeTa/V3KyLnEggwzxGf839M1EH 93W8wJG8hW3gkjG5DjNVJqI5DeYifmFZZDugYTFoVbUzBfBDJFYAGoa816cFj4FzwOPI EVoWCV2rN4azGYAxDU3l2HILsLi9ALemyYWRfsxoxWF33+rhE+72H+4jOycWcvsbwuD+ rZmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158045; x=1747762845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NiBLsAOib2fbx3En55zCnPHZz2Kn8ay16k8dNjN2Wz8=; b=YyaawqavDXQN09mHFHjKIvVxPuLeoNalj1/P9Rg5arSgbjuLI0B4NBZqLbjDPlQZC4 MExvcB9Hs67ecy/k8YJx9XOBzQqCoxYjIosZHyp0xxKlfp93hzcwR6hkBOMdqnw0NRJl A6BPNDQ3lh6ZA0F8ZE80jUAlPV4AY8A8LjT2LiwVzwyiRG3aWWQjrfa1SaEQC6KLSkG4 XtwInMUGzh67Y0FqsL+Dk9omkjuqt3QR+fYpvuCnDxbe3J3btX/aMjvlWDndTx8FRy5t OGmdEJU09MsOANBh0yj1PEQOFNoK2cnmhOASkLI47795S8PmiD/3wF2m1Q9RHlNnqF6m Ifeg== X-Gm-Message-State: AOJu0YzwrLIMXMpQNAS2x8efXx9sY+eENdZZcUicR/m3mIdeQnOehTUt C/3LZBPpQ3eCHFEHM1ea+KJC6ViAgmoQUWEWkWrUcNaUT7Qi9J6UozgmRR5RR5zhNLil/UjyngT Hlsk= X-Gm-Gg: ASbGncshNioQpNNs31aVnJfM68ktQFhVKyV8x0RNsx3R6Sy/a6YuBS085wOYA5KKJbf YOSOcSrv/TCZ38WFycq55y0LLDx/vgFBPh+QQOtE/9OXgqNe+/OHzMGEguFjbkRkfc0FZiJ6Dty +EWK89GfllEcvQZLDojUrrwa+2jNW2rOKOakUA+BSlys0joVtrxt5ylO5AjCtyVQFdHoOl6Lt3i HOSNKG96j+x0qedMM1XyfFuzGlsmoSRb9TMHJQ1OtXthrbcBrCAmidkomgvJny3DdsJTATV7ToL gdAYWKdcIJ/+6dgidfvtvI3PESRyWtgnr7ENDt8eDZWKkSzD9aX4ZebzCR/kO/2ShCsECXJFAx2 tUl1+7meXp6HY2Cy8SbFLHCrfnKEu X-Received: by 2002:a05:600c:3e87:b0:442:e0e0:250 with SMTP id 5b1f17b1804b1-442f21793d5mr2180355e9.29.1747158044743; Tue, 13 May 2025 10:40:44 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f57dddebsm16769490f8f.3.2025.05.13.10.40.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 15/19] target/arm: Extract feature definitions to 'cpu_has_feature.h' header Date: Tue, 13 May 2025 18:39:24 +0100 Message-ID: <20250513173928.77376-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/cpu.h | 54 +----------------------------- target/arm/cpu_has_feature.h | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 53 deletions(-) create mode 100644 target/arm/cpu_has_feature.h diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 116745975fa..cf3ff21965c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -30,6 +30,7 @@ #include "exec/gdbstub.h" #include "exec/page-protection.h" #include "qapi/qapi-types-common.h" +#include "target/arm/cpu_has_feature.h" #include "target/arm/gtimer.h" #define EXCP_UDEF 1 /* undefined instruction */ @@ -2376,59 +2377,6 @@ FIELD(MFAR, NS, 63, 1) QEMU_BUILD_BUG_ON(ARRAY_SIZE(((ARMCPU *)0)->ccsidr) <= R_V7M_CSSELR_INDEX_MASK); -/* If adding a feature bit which corresponds to a Linux ELF - * HWCAP bit, remember to update the feature-bit-to-hwcap - * mapping in linux-user/elfload.c:get_elf_hwcap(). - */ -enum arm_features { - ARM_FEATURE_AUXCR, /* ARM1026 Auxiliary control register. */ - ARM_FEATURE_XSCALE, /* Intel XScale extensions. */ - ARM_FEATURE_IWMMXT, /* Intel iwMMXt extension. */ - ARM_FEATURE_V6, - ARM_FEATURE_V6K, - ARM_FEATURE_V7, - ARM_FEATURE_THUMB2, - ARM_FEATURE_PMSA, /* no MMU; may have Memory Protection Unit */ - ARM_FEATURE_NEON, - ARM_FEATURE_M, /* Microcontroller profile. */ - ARM_FEATURE_OMAPCP, /* OMAP specific CP15 ops handling. */ - ARM_FEATURE_THUMB2EE, - ARM_FEATURE_V7MP, /* v7 Multiprocessing Extensions */ - ARM_FEATURE_V7VE, /* v7 Virtualization Extensions (non-EL2 parts) */ - ARM_FEATURE_V4T, - ARM_FEATURE_V5, - ARM_FEATURE_STRONGARM, - ARM_FEATURE_VAPA, /* cp15 VA to PA lookups */ - ARM_FEATURE_GENERIC_TIMER, - ARM_FEATURE_MVFR, /* Media and VFP Feature Registers 0 and 1 */ - ARM_FEATURE_DUMMY_C15_REGS, /* RAZ/WI all of cp15 crn=15 */ - ARM_FEATURE_CACHE_TEST_CLEAN, /* 926/1026 style test-and-clean ops */ - ARM_FEATURE_CACHE_DIRTY_REG, /* 1136/1176 cache dirty status register */ - ARM_FEATURE_CACHE_BLOCK_OPS, /* v6 optional cache block operations */ - ARM_FEATURE_MPIDR, /* has cp15 MPIDR */ - ARM_FEATURE_LPAE, /* has Large Physical Address Extension */ - ARM_FEATURE_V8, - ARM_FEATURE_AARCH64, /* supports 64 bit mode */ - ARM_FEATURE_CBAR, /* has cp15 CBAR */ - ARM_FEATURE_CBAR_RO, /* has cp15 CBAR and it is read-only */ - ARM_FEATURE_EL2, /* has EL2 Virtualization support */ - ARM_FEATURE_EL3, /* has EL3 Secure monitor support */ - ARM_FEATURE_THUMB_DSP, /* DSP insns supported in the Thumb encodings */ - ARM_FEATURE_PMU, /* has PMU support */ - ARM_FEATURE_VBAR, /* has cp15 VBAR */ - ARM_FEATURE_M_SECURITY, /* M profile Security Extension */ - ARM_FEATURE_M_MAIN, /* M profile Main Extension */ - ARM_FEATURE_V8_1M, /* M profile extras only in v8.1M and later */ - /* - * ARM_FEATURE_BACKCOMPAT_CNTFRQ makes the CPU default cntfrq be 62.5MHz - * if the board doesn't set a value, instead of 1GHz. It is for backwards - * compatibility and used only with CPU definitions that were already - * in QEMU before we changed the default. It should not be set on any - * CPU types added in future. - */ - ARM_FEATURE_BACKCOMPAT_CNTFRQ, /* 62.5MHz timer default */ -}; - static inline int arm_feature(CPUARMState *env, int feature) { return (env->features & (1ULL << feature)) != 0; diff --git a/target/arm/cpu_has_feature.h b/target/arm/cpu_has_feature.h new file mode 100644 index 00000000000..2adfccd9208 --- /dev/null +++ b/target/arm/cpu_has_feature.h @@ -0,0 +1,65 @@ +/* + * Helper to check ARM CPU has features + * + * Copyright (c) 2003 Fabrice Bellard + * + * SPDX-License-Identifier: LGPL-2.1-or-later + */ +#ifndef TARGET_ARM_CPU_HAS_FEATURE_H +#define TARGET_ARM_CPU_HAS_FEATURE_H + +/* + * If adding a feature bit which corresponds to a Linux ELF + * HWCAP bit, remember to update the feature-bit-to-hwcap + * mapping in linux-user/elfload.c:get_elf_hwcap(). + */ +typedef enum arm_features { + ARM_FEATURE_AUXCR, /* ARM1026 Auxiliary control register. */ + ARM_FEATURE_XSCALE, /* Intel XScale extensions. */ + ARM_FEATURE_IWMMXT, /* Intel iwMMXt extension. */ + ARM_FEATURE_V6, + ARM_FEATURE_V6K, + ARM_FEATURE_V7, + ARM_FEATURE_THUMB2, + ARM_FEATURE_PMSA, /* no MMU; may have Memory Protection Unit */ + ARM_FEATURE_NEON, + ARM_FEATURE_M, /* Microcontroller profile. */ + ARM_FEATURE_OMAPCP, /* OMAP specific CP15 ops handling. */ + ARM_FEATURE_THUMB2EE, + ARM_FEATURE_V7MP, /* v7 Multiprocessing Extensions */ + ARM_FEATURE_V7VE, /* v7 Virtualization Extensions (non-EL2 parts) */ + ARM_FEATURE_V4T, + ARM_FEATURE_V5, + ARM_FEATURE_STRONGARM, + ARM_FEATURE_VAPA, /* cp15 VA to PA lookups */ + ARM_FEATURE_GENERIC_TIMER, + ARM_FEATURE_MVFR, /* Media and VFP Feature Registers 0 and 1 */ + ARM_FEATURE_DUMMY_C15_REGS, /* RAZ/WI all of cp15 crn=15 */ + ARM_FEATURE_CACHE_TEST_CLEAN, /* 926/1026 style test-and-clean ops */ + ARM_FEATURE_CACHE_DIRTY_REG, /* 1136/1176 cache dirty status register */ + ARM_FEATURE_CACHE_BLOCK_OPS, /* v6 optional cache block operations */ + ARM_FEATURE_MPIDR, /* has cp15 MPIDR */ + ARM_FEATURE_LPAE, /* has Large Physical Address Extension */ + ARM_FEATURE_V8, + ARM_FEATURE_AARCH64, /* supports 64 bit mode */ + ARM_FEATURE_CBAR, /* has cp15 CBAR */ + ARM_FEATURE_CBAR_RO, /* has cp15 CBAR and it is read-only */ + ARM_FEATURE_EL2, /* has EL2 Virtualization support */ + ARM_FEATURE_EL3, /* has EL3 Secure monitor support */ + ARM_FEATURE_THUMB_DSP, /* DSP insns supported in the Thumb encodings */ + ARM_FEATURE_PMU, /* has PMU support */ + ARM_FEATURE_VBAR, /* has cp15 VBAR */ + ARM_FEATURE_M_SECURITY, /* M profile Security Extension */ + ARM_FEATURE_M_MAIN, /* M profile Main Extension */ + ARM_FEATURE_V8_1M, /* M profile extras only in v8.1M and later */ + /* + * ARM_FEATURE_BACKCOMPAT_CNTFRQ makes the CPU default cntfrq be 62.5MHz + * if the board doesn't set a value, instead of 1GHz. It is for backwards + * compatibility and used only with CPU definitions that were already + * in QEMU before we changed the default. It should not be set on any + * CPU types added in future. + */ + ARM_FEATURE_BACKCOMPAT_CNTFRQ, /* 62.5MHz timer default */ +} ArmCpuFeature; + +#endif From patchwork Tue May 13 17:39:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889618 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2231975wrr; Tue, 13 May 2025 10:45:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwnDkQR5P6k0hqtj35OJImO1n2n6PeDZyEDzDmIuxq4JMV+Wll1lz94vkiVh99GQwLjrdrUA==@linaro.org X-Google-Smtp-Source: AGHT+IFSS0M8pS8SchKnk9l9MNS0Ma+cufmXJxu7Io6t1y1sv3PmCCKozT2rczgYwyPAR0Cg3bMJ X-Received: by 2002:a05:6214:dcf:b0:6f5:107c:7db2 with SMTP id 6a1803df08f44-6f896dfbe03mr4726126d6.9.1747158322358; Tue, 13 May 2025 10:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158322; cv=none; d=google.com; s=arc-20240605; b=CfFn0LfNkdtQj4vQtWco8P6X/Y5kUJfFRqgQPxxnrnudegk/rw14ikwhkVphE/IIvW Y/riWP0t+uQ75MJOTz4gRl5ytS8AYJqpdo2RELk/i6nGdA1O0h2hURBqf0+6WAQCcYUZ 5JCRTej4mKUKwz42Pi5rp8JhlQMRlgQ42MEqoXVfPlbtdITJiZYqBNbs2L0K+PAph+hS NHTRWNP0Nt/oefnFVKwzxNK3UFx86Rb5QVe3hNG9uNzc40cZZTsk6ooGHeShQXyxXvrV RET0peF2KTyIXgxSZvX0k7LE5tQQODX6CYnNdSMgYY0uuen/f4Dnbnqx+wW62gu9nFLZ EK4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qVIjgN7PqQ1InviEgK5iLvt5f8f9YeJbM0wSldGeGyk=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=hU/23KGnsQhmm/KzPX36nUKVqhVLMnE4CGPlbe2pna+dPBgGnLC7sAcLcGg8Ggg0Is 7ZOrgxwixAhQJQ0x+aSWOWPDE44C4MkV6Y1G2f8FChwEujuvkrBHRY+bg7KL3PPRKe6Q PzYGuOBMg5b6/bBs0f7CNcr8XCx4d741QRsldcOKNpUYl7T/oUlFlSnx0WWBPiOzVdYf wCkJ56kn3Yc20W6xxzCuOmOM57tAVgfbbLgu0IZzwW9q+2Mu24FdNYe1AKvf7R4U+/xN YEkYNeq/A11Dohkb8YMBCUf3jUQ4PFdpNyRVqvDAePwBhgbFtRJz5U3xE39SICqYGgYG d6XA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VkOp8QP6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a42884si114386336d6.226.2025.05.13.10.45.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:45:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VkOp8QP6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtfx-0003al-QK; Tue, 13 May 2025 13:44: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 1uEtcm-0000tm-E1 for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:10 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEtcZ-0003RN-FV for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:03 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a0b9e2d640so5409887f8f.2 for ; Tue, 13 May 2025 10:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158049; x=1747762849; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qVIjgN7PqQ1InviEgK5iLvt5f8f9YeJbM0wSldGeGyk=; b=VkOp8QP6tRbv3LVEphT5bOqiwbYutgdT2gYJ+jdFF7OtkU/nW4Ra+mF9mLTYdXa9Bh aplxYINE/cwf50/0sFK8tMTUoBHs6v1bFWtd4RQFvUoGVpCz47pl6gBquTRksgUxj/t0 Blya5A7tjPBuRh9xOOu1dWo+5ynewdT8Y+VDwsWkgMyPLwV0VPD/GBsBnK7PMG0TbNuh FUCVy/FT+DlK3f5ZVs9xM8HHrvn8MvvR1fVrCz9/ZFEzSZFX07fagPHHoNg4yCFfk8iE f8UpqGG0FXrtCtDpg+Mj6j1uI5x+CvO1PzPiQ7kfz4ZC9Ir4IPAS0A/vDXAfFS4VrXAJ mwiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158049; x=1747762849; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qVIjgN7PqQ1InviEgK5iLvt5f8f9YeJbM0wSldGeGyk=; b=Sim6GHeW/r7sacOY2QkP74OEZfvbdsfjN7TQTbaE1ShDHYP+WL5cvjtI4rRr4PYqwM OlMChvERC34MRFxGRQXiEI7WnE3yxixgaOvXT9dqKnm8cM09mhCme9UBB6RqRak1G4w8 /KyA6u3yvvdznsp9pAJ1vkAv2h6z9OIknj6pyn8cND1dkurL/GSL9s9fozxGwtiqvSzs QH+lCEFRQh91YMmaAFTZCcN2oVO+uSiqUyqNToeYcF2hnYy4Jm9zlm+ASHk9XofX550N ZnR8hpebe7CWQQq3EE5vwb9SXkQSnBe51tnRRBu/5ev3ZkRIWJesqN8aBaZTVbTZMz2w mMLw== X-Gm-Message-State: AOJu0Yw/ry+lkKUhorQmAVgX+apAWYQNG1S6FfODRGbcXV1GLGq0Q7jM 9rB+SfcjQOTIhFPut4tRG2DiOvjE2uSqz2COMVlF2ellVkSlBRggQHRwYtI5EnoCDjoSRDHGv/i 6eYk= X-Gm-Gg: ASbGncvQ9x+mL/mJPVpJw7vVKvOMEMY4J39De7R6SiwYPiwHY3CQByp4iIhkmmflAyJ Vc685AH276bmgwsRWZAsWjrQejmOCBlZvAV+Gil44qv6UhO7x3GANY5YUugrh8uTGUcuSKMVjx3 wUVW5zO5Ag0o+nrPfhl8Kz+y0kfdNLzRvdLTJYdXT6A2aywuXjYqTDFO/lrkI5UuBrQyui13Q2W iIs5jDjEyre/z6ShJ06dBlf5lRsX98o7PzfB66U4RiX2YsVhqnukYAvvOiKWAKPC2vG33AGAkA9 ZLhNnKk2io0wCPQNqHL28yy0pVf7Ju00Yzx0ShfL7rO2GeER9rXO5hEbcEQ9mnPI206vbyx++On NgJuEgq35nRhS5uwK3C2tqP/31brf X-Received: by 2002:a05:6000:1889:b0:39f:28de:468 with SMTP id ffacd0b85a97d-3a3496c4202mr163244f8f.28.1747158049447; Tue, 13 May 2025 10:40:49 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a4c5e1sm16732453f8f.89.2025.05.13.10.40.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 16/19] target/arm: Add arm_cpu_has_feature() helper Date: Tue, 13 May 2025 18:39:25 +0100 Message-ID: <20250513173928.77376-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org arm_cpu_has_feature() is equivalent of arm_feature(), however while the latter uses CPUARMState so is target-specific, the former doesn't and can be called by target-agnostic code in hw/. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/cpu_has_feature.h | 2 ++ target/arm/cpu.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/target/arm/cpu_has_feature.h b/target/arm/cpu_has_feature.h index 2adfccd9208..352f9d75bed 100644 --- a/target/arm/cpu_has_feature.h +++ b/target/arm/cpu_has_feature.h @@ -62,4 +62,6 @@ typedef enum arm_features { ARM_FEATURE_BACKCOMPAT_CNTFRQ, /* 62.5MHz timer default */ } ArmCpuFeature; +bool arm_cpu_has_feature(ARMCPU *cpu, ArmCpuFeature feature); + #endif diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 8c9d161f2ef..759636a3b0e 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -54,6 +54,13 @@ #include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" +bool arm_cpu_has_feature(ARMCPU *cpu, ArmCpuFeature feature) +{ + CPUARMState *env = &cpu->env; + + return arm_feature(env, feature); +} + static void arm_cpu_set_pc(CPUState *cs, vaddr value) { ARMCPU *cpu = ARM_CPU(cs); From patchwork Tue May 13 17:39:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889628 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233864wrr; Tue, 13 May 2025 10:49:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXe9DVRFTsetcxYhWWSQQcON9+gGvB8gEq0rGYAwyxuURRVpgpXHjKLOEAvdZ+6Txu2BJYZw==@linaro.org X-Google-Smtp-Source: AGHT+IEv0Adwt7ljGcJdZizTF3HYtwZ7mNOkzL6uqH5jTNqcq8KC3A9pifht17aDI3mHIAVRlaNp X-Received: by 2002:a05:622a:1e99:b0:477:1ee2:1260 with SMTP id d75a77b69052e-49495c61e2amr7146861cf.1.1747158578617; Tue, 13 May 2025 10:49:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158578; cv=none; d=google.com; s=arc-20240605; b=U2NmRt4n3pTyCdCjnY3M8cYbimteSmmOhmA91HM4UYfNve7XqR09Y1DrUH53osrxQ1 A9zJvDg+7vNnnPQdYLldKsNX7TC0QRSAGvYujpajNDmi0oWAHMqOlHT4qqK8MCOt4hEH z/bfv/yBH1oMrvNEOjiMa/3uhMDtFdkQEog4B/8mI+yv1Aq90cYOKscMSuieEVDHiohy XW+EuOdBbhD208sz0HWEjzTHuhJjFuLOzffnrt1MSup2FBd3ZSUhZKtDcEgesPkhdLRg pXok2LRgOHXruat/r8GDDfFZF8LvDV9gf1hzluiyMjHDBocqt87tjvgukyU+Z2rKfnU/ w+OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Mc5S9P/50U+uOhuImq7ntWk/pRQZs10UmelyfyrMZ/I=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=alI1RFDNWJYzJIgxZz090vCHkL6lojYmDH6eCiS5jpaXOhh4tPWAQQaOlCxaExmTZd u7VkMGxSGp74lPixC38JGWOS+ZDgSy8r4wnE93aN2AaSPn9EPYtggTU3nOz0DGKSVlIY 8u0ti1yXS7LUx/2PNwdZx5WnmuYZeeaaIQurtOyGJVlXy2A2IGnYa0CSbnkKkd0Ug6to +/0D+kQI55w0WpB0X/xGxBwWiN+wfh6/mlBErDTYIEQLv241t4td3cerHVqPJNlk9z91 37bF9RSlYoe6S9FFHqQnCAQBkT0zLBt6ZjfJNAWT7GToGvpcU5xb49FLIZjxngUU3eEI 91UA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XtMiMzbi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4945259aef8si114395941cf.542.2025.05.13.10.49.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:49:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XtMiMzbi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtkR-0002ho-AM; Tue, 13 May 2025 13:48: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 1uEtcp-0000uB-AO for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:12 -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 1uEtcl-0003Rb-2p for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:05 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43d0618746bso45440485e9.2 for ; Tue, 13 May 2025 10:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158055; x=1747762855; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Mc5S9P/50U+uOhuImq7ntWk/pRQZs10UmelyfyrMZ/I=; b=XtMiMzbiW37jSEUA7c/VQb+J1gZozMwDIkBcgt5URMFBmPyzIdkkmhlQzPA8P4buWm 1b/BTe7GSaLNACC9+haMtbu5paHvtEa2yRuDTUC6lTX2Uhh7fuVBC4r/p87PCINFZBP0 sLm252opMS9OVXy+0kCMT+VTBkZ2MBZt9JOwIJsTJtpg1b4H0Fauh2S0Ih7xp+DfSr/+ OUrZb1A8otzlgKN0M3DKoV5xR4wATJw0MG46n0usKHrHB2HaKEIl4ZiE2RzUT9etVOXj f62VbZ7L5RaJHP2ZO2lhaLgHiz0FdA2nYrrSewiTLobYVm9xLRyj2rfHLhjZVuyVmy+X 5f3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158055; x=1747762855; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mc5S9P/50U+uOhuImq7ntWk/pRQZs10UmelyfyrMZ/I=; b=Nsembdd6fmMHLFO+cKcWjwg2o4fEqfQHr87H1VK7FtZ3i95loiIMRGKczGJaOPt7IT SaMsjAmGrXYcffs+kLRCPkek0o4CLpQC3kXjWxyQPJjYvqgCHSHdWzGvULwlD4Ze3J3S 5wrKF8NyaVKRX2TcZy8rNXfOELTNXP0OBTpQczrndyyWlbNf4YSbNb5qsvMG/9eufbuk 7+8SPm4UvxwaznhFtaG8faMkgKY90ogj+HruLdkAYHBBM4vc6M/EwEU14UrFqHtWIMBf nYCE7X1Mx358hkwJqjf6CRUxcUV65rAKXOzBHJFUxdn7aouo9apy5c/DKyfBLkEvE+QI E2vQ== X-Gm-Message-State: AOJu0Yy3a+U9wdWQPIfJ2L5q1rmMJ9Dk9YzROsTD0KJ/MFjjd93SWHh+ WNAhD9QWvNbYElSiZ/lzAjJch0saArY52tJxnMK18zOU5pd+3xFc3yNSSF3Iswl5E4hdBUsOk03 6Q8U= X-Gm-Gg: ASbGnctJCEvZiiHfPCz9zwmUehbFKUJ9pNS3tBeLqHGbdZO63U5BqIsbwb3+sWv59+w Y13/s1Q7vzDW/c0xe+7fHAG8MwpqA9kQVMG3KMWQUZZN7gM/BD0fvv2bO+2QZ1Bz/cIyroxnTRL s2AK4XiHG8zbF3LC5ylUD/j5v4K+rSSw3/NgKsgdXzepkuwIf1bzOSppl4ura4rLGjC1ADcSTzi e9vJ1dfWmcZD6srMN1aeDtxpChZhgzqL+Z9q4SCyK5cdXFH/cdQDgPjjmDKyGgLWtXnyZROqy2j /tYua/TNAg8FpIsJ98UY/FFrRGvn7+qaU/wCMU4E07vphSDy+GwcaOvxCvQugjVLGn11OAd8oUv qd6P5UdcTsHyLSNnA+5xmbJjwPUgU X-Received: by 2002:a05:600c:6308:b0:441:b3f0:e5f6 with SMTP id 5b1f17b1804b1-442f215dcc7mr1737495e9.25.1747158054951; Tue, 13 May 2025 10:40:54 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d67d7795sm181970525e9.8.2025.05.13.10.40.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 17/19] hw/arm/realview: Replace arm_feature() -> arm_cpu_has_feature() Date: Tue, 13 May 2025 18:39:26 +0100 Message-ID: <20250513173928.77376-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org By using arm_cpu_has_feature() instead of arm_feature() we don't need to include "cpu.h" anymore. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- hw/arm/realview.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 5c9050490b4..4c0a8b42709 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" @@ -31,6 +30,7 @@ #include "hw/sd/sd.h" #include "audio/audio.h" #include "target/arm/cpu-qom.h" +#include "target/arm/cpu_has_feature.h" #define SMP_BOOT_ADDR 0xe0000000 #define SMP_BOOTREG_ADDR 0x10000030 @@ -77,7 +77,6 @@ static void realview_init(MachineState *machine, enum realview_board_type board_type) { ARMCPU *cpu = NULL; - CPUARMState *env; MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram_lo; MemoryRegion *ram_hi = g_new(MemoryRegion, 1); @@ -138,16 +137,15 @@ static void realview_init(MachineState *machine, cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpuobj), ARM_CPU_IRQ); } cpu = ARM_CPU(first_cpu); - env = &cpu->env; - if (arm_feature(env, ARM_FEATURE_V7)) { + if (arm_cpu_has_feature(cpu, ARM_FEATURE_V7)) { if (is_mpcore) { proc_id = 0x0c000000; } else { proc_id = 0x0e000000; } - } else if (arm_feature(env, ARM_FEATURE_V6K)) { + } else if (arm_cpu_has_feature(cpu, ARM_FEATURE_V6K)) { proc_id = 0x06000000; - } else if (arm_feature(env, ARM_FEATURE_V6)) { + } else if (arm_cpu_has_feature(cpu, ARM_FEATURE_V6)) { proc_id = 0x04000000; } else { proc_id = 0x02000000; From patchwork Tue May 13 17:39:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889630 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2234304wrr; Tue, 13 May 2025 10:50:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdbu37hY20CVwrvrsT6VP8WBNF/c5OY7q9I24Cf/RzShwSm3/EX5LG3Y1ZpnkK6VoCd5hh6A==@linaro.org X-Google-Smtp-Source: AGHT+IHYCozHMkEwOnSsfT9RPBdbuH1cdk3OOIZe3h17cz3uYbxuzJ/2Aa7e0LmLljlqQ9FA6Otc X-Received: by 2002:a05:622a:4247:b0:47a:e6d1:4126 with SMTP id d75a77b69052e-49495d18f89mr5836921cf.39.1747158638765; Tue, 13 May 2025 10:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158638; cv=none; d=google.com; s=arc-20240605; b=ElLzTAfVjl2YbyHL6j+/K5o3rOdiLie4TCEYeUGzPPw7b2isKT3dIkjAZ2CEclCC9t AJL/LWXb5Qd8XOTU77d6MIb2gNi7cS85GsNOyOHOPzBhJPrJCxBKWKOKjRTVQNewN0+p 3akBn+dB4AW95M6PG9X8SY/d/wkPcQ0dlJ1CDnz9w5g0B2Go/dGvZKNfzeFmY0f07cTL y2PO6kppfy/8whaawNtlPSSqKvGnTWt4km75XMIhXRHXnstVXJJbqY6V0TefjKCabQXc AX8mApdH505YHCHmAsNt+nYEP+3Uin9pEXrW53iVXQVfEppKGDsrpy80Qv76USXjQF4t zU7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AdJyj/3YunQPgnoavXNfU5+nphnaMTFTvEkxD36KHXw=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=Wy47nxJqwVdTQl7eMWfmW3jM34NbbMXpkvTUEJoZ9CxTW3S2hV0cBkSBmJMyeYRe6g 4j5y2cLIr4UTsnegbqEFf+DgXWCVzmEeA+QYlTESYDDdknQql2GfAtZqpfkfkK9Ld7Yy mcPQC4wUDnxNdoooQQs3yAcvBs6/KUIvOmJd/BL2DU9+U4oh9n7sLNzNPMd13RM+DgWK MwUdVviSpyAhmDDSMrlKNLN4NX2lLkgoiX7b6W/fzKKPCNuLj30BJCKg1Xd1e70PkDCf JP8oZQUK+rfkF0n28Xiz02LcEil8y+ukuQEZ8ow9TPOX2Q6DC/9P7OAiXcszj5QTK4Su Flpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WosqhyHu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49452554e27si121362761cf.305.2025.05.13.10.50.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:50:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WosqhyHu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtka-0003YX-TA; Tue, 13 May 2025 13:49: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 1uEtcp-0000uA-9x for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:12 -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 1uEtcl-0003S6-T2 for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:05 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso60988285e9.0 for ; Tue, 13 May 2025 10:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158061; x=1747762861; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AdJyj/3YunQPgnoavXNfU5+nphnaMTFTvEkxD36KHXw=; b=WosqhyHuTW9SZYrhIMsj2t/V8Ky42HEyYP5a0EAvkvBeiibBd4434yZvC+O9mJtCgu 8Uj+kui23PYh2By/90bOgN90II4s5nJU1GKQ0guJ7Z2WnG8NRmVZ1MPDKcYd4m0dv+2C WOPo/FDLi6i5Y3dgkyokVFbGEhJ+Kfw11s7luwCwA+VREuJGZLlcGcbaKUY/FKayZ18q 9V9b2OruUozHSOJXN1GBbQwwRjUvijOU8jBYJZOnaQw3g0bhioiaRp9/WMJq0gAP+wdO cd3PqLdajaSJaWhr7dOjqfOoLiRicexGcKHfHrqev2l9r2gRjaZy+EzgyQJrOKNgK8ip dK+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158061; x=1747762861; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AdJyj/3YunQPgnoavXNfU5+nphnaMTFTvEkxD36KHXw=; b=UwY5CViVhjOVpsnqZEkoE13o77noCRxfjVGR8pK96a3x92s35Eihlp0voKu6VQ+N8t LoY4pWaLkgcRKz/1n9nSoDlH/oJ6QzVrZpLIS3d8BUNalQWcGuYnqDtnyIxN6H+8evMe 4hIYHivlakB3xdPInhnrMchO3J8fbD/v7AKdNr20AGzDsg+Yk5eTXUhQoBIP3RsQJaXL PypPgN/KSO4pTY1S8781LuckEf8LATcStUG5QSXA4xXU4mi3SVTil6mtbc0NDPxGFGah P/Wpt1Ch/uncWraYzYKpirmCoSCdiXMksV5RAHaJTabnOlQv5Rytwf4lKqjzj5BWJsH2 /4kQ== X-Gm-Message-State: AOJu0Yz6ft79ar7GP7MufIa5q0iQ8Nc9cOsXupjJVXI2ruEr/812WFa9 sKSUfW5sFwRINLCIps+mN9p8ETMAhP9ms5XL2tRdIBvn+yygBfSQYsQWqXKlofyHhwGK3qjOjJK q/OE= X-Gm-Gg: ASbGncuPEu3UDDydtEKUTAaqBl9xOd8j6AVFHa0aOPAYQ5rAaKt89xsiXrQ6s8OdsAf 3u+B0tBVHE6/rDNRwJ3pwH8Nt652YSkGu8cY11ia+XA9MkpcA8DgChKkU1UGsfoun3iNzIXVZEq 5ExtbcPtoMJn+Z0PClxesNm2Fs1c1E5pP/Cy4NoPdvlO8TcRlY4qfDX0tfse/FflJbeNXWAN/hZ S3ozpvSMe6WBialZTdyENhxj/YxYM4UA/ykkuoKjXTATg47XYyB3L24FQRC98XT7fqf7mOm17Tp ssWutFvI6NAD3DU+hSRp/+yrjLi5Uysfh0XIPNsAjIdj87Lu5DDyugCA+6JtQr4K37Dc6pBZDVC iyqLw6PtuW2OF2ixTUemFbIfUm4xD X-Received: by 2002:a05:600c:524c:b0:43c:f597:d582 with SMTP id 5b1f17b1804b1-442f20ba9f0mr1823085e9.1.1747158060572; Tue, 13 May 2025 10:41:00 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd32f194sm221374605e9.10.2025.05.13.10.40.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:41:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 18/19] hw/arm/virt-acpi: Replace arm_feature() -> arm_cpu_has_feature() Date: Tue, 13 May 2025 18:39:27 +0100 Message-ID: <20250513173928.77376-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Using arm_cpu_has_feature() instead of arm_feature() remove a dependency on (the indirectly included) "cpu.h" header. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- hw/arm/virt-acpi-build.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 20dc93fbc54..cc4ec7ad465 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -58,6 +58,7 @@ #include "hw/acpi/ghes.h" #include "hw/acpi/viot.h" #include "hw/virtio/virtio-acpi.h" +#include "target/arm/cpu_has_feature.h" #include "target/arm/multiprocessing.h" #include "target/arm/psci.h" @@ -693,7 +694,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(i)); uint64_t physical_base_address = 0, gich = 0, gicv = 0; uint32_t vgic_interrupt = vms->virt ? ARCH_GIC_MAINT_IRQ : 0; - uint32_t pmu_interrupt = arm_feature(&armcpu->env, ARM_FEATURE_PMU) ? + uint32_t pmu_interrupt = arm_cpu_has_feature(armcpu, ARM_FEATURE_PMU) ? VIRTUAL_PMU_IRQ : 0; if (vms->gic_version == VIRT_GIC_VERSION_2) { From patchwork Tue May 13 17:39:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889619 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2232289wrr; Tue, 13 May 2025 10:46:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX9dLJ2rHvFKdTQhk5400TbWOq/WIUnOKJYlXiecZTFKdLZgWvtg02BVDDoCtswIsg9bEpPpA==@linaro.org X-Google-Smtp-Source: AGHT+IH9aDU44sADG9wtGub/tImxWhc6Kk15pA8leSbFtnX1gaTVPNWw2s0q70ziHS2y2fEkjA+z X-Received: by 2002:a05:620a:170f:b0:7ca:e9a3:8b2f with SMTP id af79cd13be357-7cd2884cfa9mr52901685a.46.1747158363449; Tue, 13 May 2025 10:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158363; cv=none; d=google.com; s=arc-20240605; b=PW1YTg8ecnWjLVDMmT21UJ7NM6XNcu7zgZOy7qd7DciiwdGaF5X72vNTGNiVHPVK+S 9rAvy6Y8K5gGseMAHzKlS9dpXoV3a3nhfhGsP4B1zwVPoGJznsVXMVdDG1DTVLbYeuuY JpDhYibspaLrXrqm+Xoiprcp4MMssA+LPtyzXK+qKKgS7yrDZ3dRU7aTH11urGpx6ztT Q1aaJncc03KnRoJ7p7Q5U8b0JYyUdcE5qbeMY5UDbytA0cHMRKRDU9URzqFwOdbupcL5 qtWqzfKEqiTmDR+VrOHmMRX6d+W5i//uE4X7Ww+A1dVaGEMC6VjlObzZdSpykkf3hc3X 2Ujg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QPgspPdCqoQQVEjmAK01XGF8m07nuW7MT8jEXvl7SIQ=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=ViLMRcYVabxmTwvPZRRmjpTb5h67lMJmihibxZkbSH2IH/JHvvG/2cU77W9tbL4PQp d82CIbcZMbGXJ+EN0g2AeBWPpc3A6suUaF7ByJC/kQu6SUENouAOrRAv78sZEyO+deZE Es/O+1ft1C6EnBKs86esQrgKTP3CNkrlfwqC6RS7IP4DPKfyq9FL3npNITDkF8cE5w9G u0UGQwLGL3lshU9saCbDWy8o585MyJLSz3uYmwuODw/WbPz4zB2d74bYTkRsvZODl7GU XyaZqnp5OXZa+DUTEGlvXwHQul+5b8H9HqVjUL55NDDgewJGhWUW7BS7yn78O9mcV4Cn V1IA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CVWLPI8T; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00fd4c59si1224919185a.223.2025.05.13.10.46.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:46:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CVWLPI8T; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEtg1-0003cM-8L; Tue, 13 May 2025 13:44: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 1uEtcu-0000xz-8Z for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:14 -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 1uEtcr-0003U2-Dc for qemu-devel@nongnu.org; Tue, 13 May 2025 13:41:11 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cf05f0c3eso38918085e9.0 for ; Tue, 13 May 2025 10:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158066; x=1747762866; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QPgspPdCqoQQVEjmAK01XGF8m07nuW7MT8jEXvl7SIQ=; b=CVWLPI8T72apClAY9eF/fHR4SW55OY8/r/yLLRAobefl6EHO6mV6AUFPjwhKzHQWv7 LY44AsiE6EMaQjePASdJeztPUcN3rp1NGiXG4G7PxsLRBYpZVdPqKeRS+7tlFTZSHDZT SwRtttORsnl+OQ4wHhebP3vdj/xO/P8YJxEmCPRxpWuBaxvbr28Es7yJFvKjcsmBlgJ5 ml5Pwj/edq661zp1Vb+UdNQFevQBnqUY4MyivPmjdLkcFlnDIVvzTGFZWdxtvnc7R3xA N0Ntd3q+31Ft7THPWGpocg4+SJtpuW4ujJtVY+rdeM25j2J8aILJ5PvZlc7KCcFMAeQs IS4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158066; x=1747762866; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QPgspPdCqoQQVEjmAK01XGF8m07nuW7MT8jEXvl7SIQ=; b=IOV8JP3JjE39eOkj1Ir+p/xkTHZ80GgK5DIVIwaFhkrt/Te+Ki7an4mmLZxJHbExHX E1e4QprKuKPSTUifQBTSqhoeoX+FiPwrhRZwgHxVnOLvZ+PEBtDmFcq2pAFrhpq2TRDR 0FNJqFqaKLZUa8TJSk3ZY/FJXl9Omx4a1jeoLmTEQkMxkZhI9lQ7AxisK7kWS5XuxDeV d0wcljPqD0YdcyuR08HnyuSysz2TKPoT+rPALq7za97jcOlY6sg6/UnEUB9IJGFHX9TA EeDFrrvM568/DJiaP/1Xxd9Y7DOuVWsMQ+rMhQXUXgKUb8Ow5/KgTphji3D4HGkUTZs7 f1+A== X-Gm-Message-State: AOJu0Yy45chTBr3souP52GTng8Gf8nIF5DXR4uLYDyGhp9cMOsW2Gdn6 lIGqqTQWAg+iyALJvLaYZ+xE2i3l62VVZ4sSuCZ0mbJB2/4qWsP1QXS8pxhKnBPoPsGB5x82Meb tdyg= X-Gm-Gg: ASbGncvd2a35cGYU1KddmokvGIpg585fmGwqqi5ktD3wwlioFg1D3Ww1Lym/Wjb7/Aa yr11XLO0+UhSlQxS4kjl7yRsiopauhTQJBKU8I0BSrOL5+hSODXgGRF5Ul182MmHoTNKovm2kSr WdXKS2J4keyes+zmz4eGICAEi0YAg0QwsSZ2i3jrsK0xALIuXPawWG8sXQDEoCcdVYpJByQCX20 7Rb5Vvl2VwH2B40ksEpfg2zuENAhKcmm84ptxR9jveCedWrugJSrfzJG4VA5gaJtYhPY/yvBtWX Y7VHMMEonhOLRiAnSUczo5Cvba4//lLeVJ0QTfbX9gewvGVpNS7ghSG6P8NdBnF/m9otM1KkCLJ 6h/uhlJCpdEXkcg5+9AvwvASHklSU X-Received: by 2002:a05:600c:1c12:b0:440:61eb:2ce5 with SMTP id 5b1f17b1804b1-442f20ffcc5mr2262185e9.17.1747158066257; Tue, 13 May 2025 10:41:06 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd3aeb6esm222584945e9.25.2025.05.13.10.41.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:41:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 19/19] target/arm: Always include full path to 'cpu.h' Date: Tue, 13 May 2025 18:39:28 +0100 Message-ID: <20250513173928.77376-20-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Some files include "cpu.h", others "target/arm/cpu.h". Unify by using the latter which is more explicit. Suggested-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/arm/cpregs.h | 2 +- target/arm/cpu-features.h | 2 +- target/arm/tcg/translate.h | 2 +- target/arm/arch_dump.c | 2 +- target/arm/arm-powerctl.c | 2 +- target/arm/arm-qmp-cmds.c | 2 +- target/arm/cortex-regs.c | 2 +- target/arm/cpu.c | 2 +- target/arm/cpu64.c | 2 +- target/arm/debug_helper.c | 2 +- target/arm/gdbstub.c | 2 +- target/arm/gdbstub64.c | 2 +- target/arm/helper.c | 2 +- target/arm/hyp_gdbstub.c | 2 +- target/arm/kvm-stub.c | 2 +- target/arm/kvm.c | 2 +- target/arm/machine.c | 2 +- target/arm/ptw.c | 2 +- target/arm/tcg-stubs.c | 2 +- target/arm/tcg/cpu-v7m.c | 2 +- target/arm/tcg/cpu32.c | 2 +- target/arm/tcg/cpu64.c | 2 +- target/arm/tcg/helper-a64.c | 2 +- target/arm/tcg/hflags.c | 2 +- target/arm/tcg/iwmmxt_helper.c | 2 +- target/arm/tcg/m_helper.c | 2 +- target/arm/tcg/mte_helper.c | 2 +- target/arm/tcg/mve_helper.c | 2 +- target/arm/tcg/neon_helper.c | 2 +- target/arm/tcg/op_helper.c | 2 +- target/arm/tcg/pauth_helper.c | 2 +- target/arm/tcg/psci.c | 2 +- target/arm/tcg/sme_helper.c | 2 +- target/arm/tcg/sve_helper.c | 2 +- target/arm/tcg/tlb-insns.c | 2 +- target/arm/tcg/tlb_helper.c | 2 +- target/arm/tcg/vec_helper.c | 2 +- target/arm/tcg/vfp_helper.c | 2 +- target/arm/vfp_fpscr.c | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index c1a7ae37356..25a7c2928ba 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -23,7 +23,7 @@ #include "hw/registerfields.h" #include "target/arm/kvm-consts.h" -#include "cpu.h" +#include "target/arm/cpu.h" /* * ARMCPRegInfo type field bits: diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 4452e7c21e3..90c5efd6eac 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -22,7 +22,7 @@ #include "hw/registerfields.h" #include "qemu/host-utils.h" -#include "cpu.h" +#include "target/arm/cpu.h" /* * Naming convention for isar_feature functions: diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 1bfdb0fb9bb..f8eb0d4a5a8 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -1,7 +1,7 @@ #ifndef TARGET_ARM_TRANSLATE_H #define TARGET_ARM_TRANSLATE_H -#include "cpu.h" +#include "target/arm/cpu.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" #include "exec/translator.h" diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c index 1dd79849c13..9c90430d1b6 100644 --- a/target/arm/arch_dump.c +++ b/target/arm/arch_dump.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "elf.h" #include "system/dump.h" #include "cpu-features.h" diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c index 20c70c7d6bb..4cffe557e37 100644 --- a/target/arm/arm-powerctl.c +++ b/target/arm/arm-powerctl.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "cpu-qom.h" #include "internals.h" #include "arm-powerctl.h" diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index 930ec37413d..392887d3b48 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -30,7 +30,7 @@ #include "qapi/qapi-commands-misc-target.h" #include "qobject/qdict.h" #include "qom/qom-qobject.h" -#include "cpu.h" +#include "target/arm/cpu.h" static GICCapability *gic_cap_new(int version) { diff --git a/target/arm/cortex-regs.c b/target/arm/cortex-regs.c index ae817b08ddf..2caa8855f02 100644 --- a/target/arm/cortex-regs.c +++ b/target/arm/cortex-regs.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "cpregs.h" diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 759636a3b0e..00f06916e62 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -27,7 +27,7 @@ #include "target/arm/idau.h" #include "qemu/module.h" #include "qapi/error.h" -#include "cpu.h" +#include "target/arm/cpu.h" #ifdef CONFIG_TCG #include "exec/translation-block.h" #include "accel/tcg/cpu-ops.h" diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 00629a5d1d1..34f43094da9 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "cpregs.h" #include "qemu/module.h" #include "qemu/units.h" diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 69fb1d0d9ff..a6199a73740 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" #include "qemu/log.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "cpregs.h" diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index ce4497ad7c3..d148d8434f1 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -18,7 +18,7 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "exec/gdbstub.h" #include "gdbstub/helpers.h" #include "gdbstub/commands.h" diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index 64ee9b3b567..b6033f431d8 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" #include "qemu/log.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "gdbstub/helpers.h" #include "gdbstub/commands.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index 7859729c39f..05a50c5c750 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "exec/page-protection.h" diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index bb5969720ce..73c9a9a8333 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "gdbstub/enums.h" diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 34e57fab011..532018b745e 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -10,7 +10,7 @@ * */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "kvm_arm.h" bool write_kvmstate_to_list(ARMCPU *cpu) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 5969249b579..d280d08a63e 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -25,7 +25,7 @@ #include "system/kvm.h" #include "system/kvm_int.h" #include "kvm_arm.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "trace.h" #include "internals.h" #include "hw/pci/pci.h" diff --git a/target/arm/machine.c b/target/arm/machine.c index e442d485241..f0524615fe1 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "qemu/error-report.h" #include "system/kvm.h" #include "system/tcg.h" diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 44170d831cc..03047d10d87 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -14,7 +14,7 @@ #include "exec/target_page.h" #include "exec/tlb-flags.h" #include "accel/tcg/probe.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "idau.h" diff --git a/target/arm/tcg-stubs.c b/target/arm/tcg-stubs.c index 5e5166c0490..672b5b01db0 100644 --- a/target/arm/tcg-stubs.c +++ b/target/arm/tcg-stubs.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" void write_v7m_exception(CPUARMState *env, uint32_t new_exc) diff --git a/target/arm/tcg/cpu-v7m.c b/target/arm/tcg/cpu-v7m.c index 95b23d9b55d..9b7108d9678 100644 --- a/target/arm/tcg/cpu-v7m.c +++ b/target/arm/tcg/cpu-v7m.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 2c45b7eddda..5bf78d9240a 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" #include "target/arm/idau.h" diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 29ab0ac79da..c95036df2a5 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "qemu/module.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 4f618ae390e..1713348a55d 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "gdbstub/helpers.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 1ccec63bbd4..d77eacb7338 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "exec/translation-block.h" diff --git a/target/arm/tcg/iwmmxt_helper.c b/target/arm/tcg/iwmmxt_helper.c index ba054b6b4db..3489f6d01c3 100644 --- a/target/arm/tcg/iwmmxt_helper.c +++ b/target/arm/tcg/iwmmxt_helper.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #define HELPER_H "tcg/helper.h" #include "exec/helper-proto.h.inc" diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 6614719832e..5d657f5c753 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "gdbstub/helpers.h" diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 0efc18a181e..66e90b03520 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "exec/page-protection.h" #ifdef CONFIG_USER_ONLY diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 506d1c34757..105fc0a4b9d 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "vec_internal.h" #include "exec/helper-proto.h" diff --git a/target/arm/tcg/neon_helper.c b/target/arm/tcg/neon_helper.c index 2cc8241f1e4..44f1aafd17d 100644 --- a/target/arm/tcg/neon_helper.c +++ b/target/arm/tcg/neon_helper.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" #include "vec_internal.h" diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index e0f9c91450a..3a4a76e999e 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" #include "qemu/main-loop.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "exec/helper-proto.h" #include "exec/target_page.h" #include "internals.h" diff --git a/target/arm/tcg/pauth_helper.c b/target/arm/tcg/pauth_helper.c index c591c3052c3..0ae329710ac 100644 --- a/target/arm/tcg/pauth_helper.c +++ b/target/arm/tcg/pauth_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "accel/tcg/cpu-ldst.h" diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c index 0313cdd6ba2..05ecd647c9f 100644 --- a/target/arm/tcg/psci.c +++ b/target/arm/tcg/psci.c @@ -17,7 +17,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "exec/helper-proto.h" #include "kvm-consts.h" #include "qemu/main-loop.h" diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c index de0c6e54d4b..a2104b4751d 100644 --- a/target/arm/tcg/sme_helper.c +++ b/target/arm/tcg/sme_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "tcg/tcg-gvec-desc.h" #include "exec/helper-proto.h" diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index a2c363a4e17..afd110431cd 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "exec/page-protection.h" #include "exec/helper-proto.h" diff --git a/target/arm/tcg/tlb-insns.c b/target/arm/tcg/tlb-insns.c index 95c26c6d463..bc8353cdbb5 100644 --- a/target/arm/tcg/tlb-insns.c +++ b/target/arm/tcg/tlb-insns.c @@ -9,7 +9,7 @@ #include "qemu/log.h" #include "exec/cputlb.h" #include "exec/target_page.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "cpregs.h" diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 23c72a99f5c..ea7d0c74c88 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c index 986eaf8ffa4..9e2715e34de 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" diff --git a/target/arm/tcg/vfp_helper.c b/target/arm/tcg/vfp_helper.c index b1324c5c0a6..ac532ef8511 100644 --- a/target/arm/tcg/vfp_helper.c +++ b/target/arm/tcg/vfp_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "fpu/softfloat.h" diff --git a/target/arm/vfp_fpscr.c b/target/arm/vfp_fpscr.c index 92ea60ebbf2..a196bcfa803 100644 --- a/target/arm/vfp_fpscr.c +++ b/target/arm/vfp_fpscr.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h"