From patchwork Thu Apr 3 23:57:43 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: 878007 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529565wrs; Thu, 3 Apr 2025 16:59:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXusJRkOZ72zbh+JD7ykh3Qd9OgiMPqUchC46S5ZoEwUghxHTq8rvTj5SDZ9DpcVXTL6G8PLg==@linaro.org X-Google-Smtp-Source: AGHT+IGIxjJCnScYQeb1B7MoWZXVUApBZWX2h3XmPwI0Rv0ioVGI+R1MaHCtHVmJFxe3Y5wJhhYA X-Received: by 2002:a05:6214:2585:b0:6e8:96f4:733 with SMTP id 6a1803df08f44-6f00de712f3mr22124266d6.8.1743724761470; Thu, 03 Apr 2025 16:59:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724761; cv=none; d=google.com; s=arc-20240605; b=bzI+idepYzru9yHr1oM4pEdgGWx77Ux5mxG1GqdZedKHWKdlrndrmjGUCeHYAbLW/5 lEDB9L21yq9HcrL6FE4hbubqx1wQimWqR3fnnBe5vVy9GHkd/cFD+qOhe0d86RjGt0bw 3eskFdz5jGdnPPXwDZvB8Bk1AwPx6QeZFlh6BNqQhrIxLVUgKuMLidfPPH6Bc3aprVei t21ms7pZ91hLZ3d+idZIS10vtoVCli6vh1Vk0kKVuuxjfUpZZpdz7ACV+NLZQ9lW3r5+ S85jptyLiV06pnO0WseNZW8vSI/ITJxoaA1w7EMhd33w9gJ1uVaEF8e0OoTH+mPVhhsL rrqQ== 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=geI/22Nys2tzXx8N0Oa1NtqG7J0932lhMqpg1NTfRdM=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=ebBElEmIFUslUq7SFm3jE8O1hj8LTvwcD0GF3CF73b7874sdcAZnZ06KnOG9agZ38i eBYJxXs8dgpf8Du4CBSV4m5uwi94GCiXSIfAxvSqKrCSyo51c/sCG+Ec1XginW4jKst0 SoD0Kf9V6Oc/gTYX86ENA2M/S5zmVccZlmD3GLjhPRG6gVqy4eU+DVNkze6M6DROeNEF ZuCeg4Dh0eCb91bwIDVOL7o4vurltvAkvgoE6PvS801Cy2XLpIT+SMoSWVTTu2m9/q9r uYkU43E4ZOJ9brJVHWBZZLEgdS5PygC0zHXxyy+fv+34bAPZiwIXi4OsxIvjn0wzDoKc 0ECA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eExupvnu; 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-6ef0f00e82fsi20776896d6.132.2025.04.03.16.59.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59:21 -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=eExupvnu; 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 1u0USC-0004Oe-NE; Thu, 03 Apr 2025 19:58:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0USB-0004OP-6M for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:58:35 -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 1u0US9-0002Q3-IT for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:58:34 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39ac8e7688aso1073249f8f.2 for ; Thu, 03 Apr 2025 16:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724712; x=1744329512; 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=geI/22Nys2tzXx8N0Oa1NtqG7J0932lhMqpg1NTfRdM=; b=eExupvnu41B1mrQg0nmDxQUhfO9x8jn90x/bYDl9FjInrLYzx8+hWx6pmHKQLCjh/G aaDBezGCH6/vb0+93RvR3iPIHH9DBjTrKI4fNuwwZEiZ0tBbXtbMH7vYFTeHJQpOe6dI 7iHrnre58Jw3NbkVT8DgIaJUaNmUK5oo1LMHv4T3El8n2hxViGf1NDRrTXKrI79sKOcq aYatzLtTyetYAO/yQVSeoGVWjEubgUxZPdTrrF47bZqGJ8SPntsjqZT+HcV9xR6u+fiz SsDgW8+nsN/fgI+OscShjKzIH3Hj8f0iGHd6q4hApe+nQjpogYLeNNCo35OC4qPE8dXT SbTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724712; x=1744329512; 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=geI/22Nys2tzXx8N0Oa1NtqG7J0932lhMqpg1NTfRdM=; b=IEVFBMyRtHoBe7MWHzT38ertSrsdmv80F3Ltvppo2e+EVjWugXcQFJDor7ULG7tODq lvAss/g0TnMJAroqeX70LdQ4r15++qryhA1Ma7GODMhsnXu0svHpe75RGcTUk2C/U6jD 9eEYm/86QbLxNegHzR6f5Edter8CJnBcm+0v6Mw6RMHBsQxjVn+oz3v8gY648PmO9KGo aK5d++KopAC/gt9FVP6/ubav5XYDhIVwmx3aJdKpp/sFU2icYaD8VER7fVySju/OIJNU uCsYeNpI7PYyqNze+svQAUsU50ufqRUuAASgfSG+nw73jVv9EG+Q9VBF7NJEKfrvKgbU mkBw== X-Gm-Message-State: AOJu0YxvFFEAyDI8xYbt8X/A2mfmhy0dXjQ3okGYxK5oLsbvYF459N6i wUCLCIlbDtFEyXO4N2oNxIkRNW2FX4E1elrUHKpiara153wjlkJWGFxa9gu0Nn7CJL8zkwI40gQ d X-Gm-Gg: ASbGnctl/xaU1bp8HMY1+7Km1SO23qqfwLgutGE0QMakyKJsKgo/d/yWJmwNE2kw0x3 TlNn5jF6taBibTZ01JkjSfDpnFFIV0hGaGP69Bit/355VjlaXTAWaUARZ8XgRwbUOKFJsfF/aI6 F25nUtjTDX7MNrCIQ61k8xubAyECSWuaENM42FY39v577vav+9cxQnjZpRKd5yRhaLLS/bcNeLr uYq2q6OjHVgYki9LkdW/U3k5TsajbW1Ltq4GLE4zQIiW6mcpbiyhrShE7o1OTjcJc2fWepyb9vc hzozO8O+OhYghW6YZRLxocnghs9R51jTJGJIWo5cJTrI+lojsgaoM/56mMbOGYqcHewwm7zQLeU jlyOWt09rBGZEkxXkWmg= X-Received: by 2002:a05:6000:290d:b0:391:3f64:ed00 with SMTP id ffacd0b85a97d-39cba9324b9mr873943f8f.26.1743724711683; Thu, 03 Apr 2025 16:58:31 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020da49sm2905632f8f.80.2025.04.03.16.58.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:58:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 01/39] target/arm: Implement per-binary TargetInfo structures Date: Fri, 4 Apr 2025 01:57:43 +0200 Message-ID: <20250403235821.9909-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 1 + target/arm/target_info-aarch64-softmmu.c | 24 ++++++++++++++++++++++++ target/arm/target_info-arm-softmmu.c | 24 ++++++++++++++++++++++++ target/arm/meson.build | 5 +++++ 4 files changed, 54 insertions(+) create mode 100644 target/arm/target_info-aarch64-softmmu.c create mode 100644 target/arm/target_info-arm-softmmu.c diff --git a/meson.build b/meson.build index b93253166c8..9df662932a4 100644 --- a/meson.build +++ b/meson.build @@ -3263,6 +3263,7 @@ host_kconfig = \ ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] target_info = [ + 'arm-softmmu', 'aarch64-softmmu', ] default_targets = 'CONFIG_DEFAULT_TARGETS' in config_host diff --git a/target/arm/target_info-aarch64-softmmu.c b/target/arm/target_info-aarch64-softmmu.c new file mode 100644 index 00000000000..002aac642f8 --- /dev/null +++ b/target/arm/target_info-aarch64-softmmu.c @@ -0,0 +1,24 @@ +/* + * QEMU legacy binary helpers + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/target_info-impl.h" +#include "cpu-qom.h" + +static const BinaryTargetInfo target_info_aarch64_system = { + .name = "aarch64", + .system_arch = SYS_EMU_TARGET_AARCH64, + .endianness = ENDIAN_MODE_LITTLE, + .long_bits = 64, + .cpu_resolving_type = TYPE_ARM_CPU, +}; + +const BinaryTargetInfo *target_info(void) +{ + return &target_info_aarch64_system; +} diff --git a/target/arm/target_info-arm-softmmu.c b/target/arm/target_info-arm-softmmu.c new file mode 100644 index 00000000000..24b68b1ad8b --- /dev/null +++ b/target/arm/target_info-arm-softmmu.c @@ -0,0 +1,24 @@ +/* + * QEMU legacy binary helpers + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/target_info-impl.h" +#include "cpu-qom.h" + +static const BinaryTargetInfo target_info_arm_system = { + .name = "arm", + .system_arch = SYS_EMU_TARGET_ARM, + .endianness = ENDIAN_MODE_LITTLE, + .long_bits = 32, + .cpu_resolving_type = TYPE_ARM_CPU, +}; + +const BinaryTargetInfo *target_info(void) +{ + return &target_info_arm_system; +} diff --git a/target/arm/meson.build b/target/arm/meson.build index 3065081d241..706c49c1b2a 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -25,6 +25,11 @@ arm_system_ss.add(files( 'machine.c', 'ptw.c', )) +arm_system_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'target_info-aarch64-softmmu.c', +), if_false: files( + 'target_info-arm-softmmu.c', +)) arm_user_ss = ss.source_set() From patchwork Thu Apr 3 23:57:44 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: 878008 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529595wrs; Thu, 3 Apr 2025 16:59:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU3mXiiQwsDu8SYjtzj22MR6MZq47FWy8+cA9TgxLWv46/9qOqUO3+SY5a8iQ+U0+0DYxOkeQ==@linaro.org X-Google-Smtp-Source: AGHT+IEG9fknhxOIRkpmhyfatfK9ImnRgxXPOA2fDo8TvljZfgdCNMJpYimJFKuJ2TijWV6tu899 X-Received: by 2002:a05:620a:46ac:b0:7c5:47c6:b886 with SMTP id af79cd13be357-7c774dd6d6cmr197630285a.43.1743724766619; Thu, 03 Apr 2025 16:59:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724766; cv=none; d=google.com; s=arc-20240605; b=StJY42tgu5JRl5QW2r3uIKVpPK1w0C4xeRK2ShwSWUvgzdLZg2FmXzAFNC8yXBC9zH 9AS9CSRznzgWakD+0j4mofc1SHc5ZZKj0B2J7guYcNR5FDxpV4FqR8z9zsOJCFZR2pBG nRhu7iouFbNLXlWEf2A6GMcpb9nGoy2qTKtrSJn8FjQBz+gTmgdDagY7lNc6Wrfcx9nb T3AHZgYXUw2QLVVe2cJjHk/sVZWRTUzhVEMV5IWWjub0R+LkX54XUMFcdKSkZjrKYTgK Wb2QIUoyjMqNVfUaH//GY9KP+owDAclGUYDWly6EAdc38yCDN/wWhx3FwtlUbLRC1uHh C72Q== 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=gqJyLYQ99OAQqFYuKShvFfQyIlJYmG5rcZMVwRgrMss=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=BVP1TppKmb/wSSnqKkEkeLqgxvGEtvIyuiUgtumDnWqNE3dy/aUz3qQH1fo7ji8RBo 1lvKyEawgQi/dRBeemUxqrKcuzgY8E7jHNyNR2wfvt3WyjnB0Pcbc3Vcu9JB81Jps4TW 6mdRrLlMRjZWmc4FLaMm8LiK7uo33yUCY3PxSaoBH7+SzaFE2uMHfyDPoKMygVGrKzxA BmwMcDv68R57lpQBpsl3OM9Hl/VRgBHrjYvcPOwx+KZAek6tR9SbwjTO7Krc5GNzqAMz CEEFGhPfl1yLn8UFN4RgRsrPUegjH8gEbj5MR2BfAA3LDFSP1OZSuzt+3k33A2V3GPk/ Ft/Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TeJWlHOV; 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-7c76e749b83si213547685a.73.2025.04.03.16.59.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59:26 -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=TeJWlHOV; 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 1u0USM-0004PU-AX; Thu, 03 Apr 2025 19:58:46 -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 1u0USJ-0004PB-DJ for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:58: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 1u0USH-0002Rj-QA for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:58:43 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so14488175e9.3 for ; Thu, 03 Apr 2025 16:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724719; x=1744329519; 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=gqJyLYQ99OAQqFYuKShvFfQyIlJYmG5rcZMVwRgrMss=; b=TeJWlHOVYY3t1HLL9aN0HFegP1z3Pul4fyd/9miQlNNFCHL8X7uOuv3qnldjpE9vD7 1Zps0Iw96uiIynhbf/w+K1VwbmGK9R8mepbl3WfsblxyQ5NX87cXxvJQt7OSyqvD26wS 0bXu4nxFzQRzzj5Sl15eJAAoGW/ZtH/2lNKoAueTtPf7/GP8gyTAO/49LGRFTDCi2FJQ 5L6zg6zp+JxmvVQGAUslMW+vGa3TJX/Ud4N357XiRgcjfQY82eTokNXIdE0V/smGBHeo xTSdaaUgMQkFPS/RvcjcZmqIHr2lS2i/sQ3du+uUCcj5T9Ll0iM6BcXUvQZK5axLLLrU YPbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724719; x=1744329519; 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=gqJyLYQ99OAQqFYuKShvFfQyIlJYmG5rcZMVwRgrMss=; b=tBp6YLd4g5ub4xW51gl5KHDhTFfi5BPzfGwnxSHzpN7TMKJnTFjX7pyX2MyS2wr1rr jIzvPWkUYsJ7qQh534rbcm4lU2rfCZI2+QL5cOYWV/MaxcnBeZ/4gVzwBI9jQuVkYAf7 gVYJyLACWwqIrr51LxANe/PzKqD7AJPbGsUuD4v/fenBZfqBMNNrJLBhiJrLA+uyVc4b sG87illWgP4lVZXXbfp3vJ0cc8YvCVRNK4aH7SfitqX0IlbDxKHnkYgiM4TEQaXbVkIb 2PcNVEmhtdsimvxL/PqeYy2akkcgPZykQPD8hNA0cSuXu5pu79RbDBMyRT3y4LasYGBQ 70+w== X-Gm-Message-State: AOJu0Yyo+PaJgbXxHIHHXsiHVF2mmCIcGODjz0jEUkk8/XPaYmhBssnL eZBPLMoyPmQzQK6NDd0MJU+a6zJo3Oah7rCt17oQ3fuVFwLbkTthOmACTyB3Uu8SuzCNSMgF4Rx L X-Gm-Gg: ASbGnctK3KJAMM0ZQWPa9NkTJuJOyolVSsAf+r2MZfHQIBxZVLiBglN/n/mNuckKndj GqgoKUUcIqAdDdGC/M008antXQ+i9oTvCefdorhxagjyBRLdBdcrHFpppe/+xZN/Y5T0GVNobgy JR97hCM9LTmqK7U5Yiz8Jmj/o/BWetcim/8XorWwblrK+Q3Be4b2eNV3F+ZwW2kg/pWb/Ty29TW Auq3k/CGbRx9+D6NW04ubCMuAqSRKV/fnpAKZ1awth9wQFsU8l84Ci2WH9ipqCghLP4yO2gC/ry X5bBcFnuDjrPcq9jF4tXC/bT1KXzCHSue1sWvQ6G+T4eLfYT1MBBeUiCDHuUmBUiRiSpQ7XD6P1 t1wSYccV9oJYywKevH64= X-Received: by 2002:a05:600c:18a6:b0:43d:98e7:38dc with SMTP id 5b1f17b1804b1-43ed242f065mr1331375e9.5.1743724719380; Thu, 03 Apr 2025 16:58:39 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec34ae0c5sm30916015e9.15.2025.04.03.16.58.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:58:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 02/39] target/arm: Register TYPE_BINARY_QEMU_SYSTEM_ARM/AARCH64 interfaces Date: Fri, 4 Apr 2025 01:57:44 +0200 Message-ID: <20250403235821.9909-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/target_info-qom.h | 20 ++++++++++++++++++++ target_info-qom.c | 8 ++++++++ 2 files changed, 28 insertions(+) diff --git a/include/qemu/target_info-qom.h b/include/qemu/target_info-qom.h index c87d47acf66..880b34e699e 100644 --- a/include/qemu/target_info-qom.h +++ b/include/qemu/target_info-qom.h @@ -9,6 +9,26 @@ #ifndef QEMU_TARGET_INFO_QOM_H #define QEMU_TARGET_INFO_QOM_H +#include "qom/object.h" + #define TYPE_LEGACY_BINARY_PREFIX "legacy-binary-" +#define TYPE_LEGACY_BINARY_QEMU_SYSTEM_ARM \ + "legacy-binary-qemu-system-arm" +#define TYPE_LEGACY_BINARY_QEMU_SYSTEM_AARCH64 \ + "legacy-binary-qemu-system-aarch64" + +#define LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE \ + (InterfaceInfo[]) { \ + { TYPE_LEGACY_BINARY_QEMU_SYSTEM_ARM }, \ + { TYPE_LEGACY_BINARY_QEMU_SYSTEM_AARCH64 }, \ + { }, \ + } + +#define LEGACY_BINARY_QEMU_SYSTEM_AARCH64_INTERFACE \ + (InterfaceInfo[]) { \ + { TYPE_LEGACY_BINARY_QEMU_SYSTEM_AARCH64 }, \ + { }, \ + } + #endif diff --git a/target_info-qom.c b/target_info-qom.c index 6970b95ee0b..db3054c307d 100644 --- a/target_info-qom.c +++ b/target_info-qom.c @@ -10,6 +10,14 @@ #include "qemu/target_info-qom.h" static const TypeInfo target_info_types[] = { + { + .name = TYPE_LEGACY_BINARY_QEMU_SYSTEM_ARM, + .parent = TYPE_INTERFACE, + }, + { + .name = TYPE_LEGACY_BINARY_QEMU_SYSTEM_AARCH64, + .parent = TYPE_INTERFACE, + }, }; DEFINE_TYPES(target_info_types) From patchwork Thu Apr 3 23:57:45 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: 878016 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529763wrs; Thu, 3 Apr 2025 16:59:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXkPBEqrQJKyfe1IAx/n4HS7Jmb1qGJascGbkKtNMAnh1xe2C3+Di0YgzEcB6YA1HdaZSUtzA==@linaro.org X-Google-Smtp-Source: AGHT+IHoVtLL+17/BsTKv+8oClVhjm2MQjgVQV0RqWM4hrvhygWyijIgscHtQao4UJdWd7O286qG X-Received: by 2002:a05:620a:44d1:b0:7c5:5229:2f18 with SMTP id af79cd13be357-7c774d1c7d2mr209062785a.6.1743724795782; Thu, 03 Apr 2025 16:59:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724795; cv=none; d=google.com; s=arc-20240605; b=cYHS59p1z4vZfWjz6GuOELXYvsywuu3AiKGUWmAT7udUw9fr94dwprWDgH2j/E1Uef 144qK0h4ow2b/Ex6tKdBCS8dxOsLmcYvA5Fkp39dO2HQv77sDwvBvEJURL59z46yicWq h8AbId30oI+Gkf+JMbZ84oU4GIGtF3qhChIwT6/JinRgfcoRtzQo9JtuP/UWr/I5r1KY +eEqmjVx6dqS4v3f6AWgeMMWK+aGzPWdupAHOgwputVQe6zXDIq+vUP3sG/qP96D+XW0 RR92KRs760uOfqCg0O07FCeadkjyEYw9I9/6RtExHNiDwrBf7XlFtPyVSEc/Qs5NB8DR r68g== 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=PhZdnfz+UN3n5DTP+/t+ydvw2Q2+PLLpLlc8rXzZtok=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=lCt1zZ0ErDG0jTkOJ1WgssxF73pitNDfIVUJf1oqLZ/Cbc4ZoWDWZd5V1yRMDKXMem cf+dVxqks4ty/4wpKyuOXuWyI2aYxTFI5shv5+MyXEPaJ9tk1kbtMwAwCG/HY7IeOo0p MZZAVse6UxbRe4Mx5RTFyUAIxC4wLBP+J1eOTuwWh9dfcbB7SsUxS56x6YSnEg0xn36e eMkVLNsXAqOKWmQzb98zEWkjukwDuMx0cQtqIrRtNMR87v4j0mWmBQBphXadJC942BnT NYI+K2ZZEhFMqIj1+SxLTQAsc1DumW8Nh+tkum7bYSLT3JL5R1f0c1avp713am5j4s7z UE+A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kRx5dde1; 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-7c76e74897csi218978685a.8.2025.04.03.16.59.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59: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=kRx5dde1; 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 1u0USR-0004Uh-1n; Thu, 03 Apr 2025 19:58:51 -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 1u0USP-0004Tm-Ow for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:58:49 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0USO-0002Se-3m for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:58:49 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-39c266c2dd5so1253652f8f.3 for ; Thu, 03 Apr 2025 16:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724726; x=1744329526; 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=PhZdnfz+UN3n5DTP+/t+ydvw2Q2+PLLpLlc8rXzZtok=; b=kRx5dde1Yog1lAr8bZtO0rLvJIknK1sCN4I/81vI7edQrfZPIsajzp8t2yZC1MJzLz pCdGMLBw7edR9Me+5ichLOpMfrybljkrSORdPupUzysU5E79xXHnEd0V4k0ph73KmgV0 v9o9EMeDM04ouOesuYi1y2/kx8aS5R9q3PenwJj+V8ZSAJ/QjQ0PinEhDXJO/VhzzIgh bzKCoG4tKkP7Jdl2C2iGuR+uuQpiEENAr8EGpNrAZObsT6H8khOrBkA1iTic2y0ssmAz yrIwVwLk2LJ3Ym1020hIKSLUlf5fA5fooY91vluxe32r05uiK4GX1OScqdjZDrxIkP3t Jj6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724726; x=1744329526; 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=PhZdnfz+UN3n5DTP+/t+ydvw2Q2+PLLpLlc8rXzZtok=; b=buYXKQgZzPXVsTzyuhlOb3grCew0IXH/jQy4Z3BHSjKDY6orR7cVn1vFs2ctk+d8Mh 97VchnnSswNUFLZyd2qmf8iHgalBSDVfOSQlVm5IDR81gBkvN4D1gSO+mqs2gQzvjF2/ bl377JcGaK96jjjx3Wu2eBt1yEdbSursBQqu4yI942lg1jTwQEGDfjyT7U83egLjjtzK Wa2GPtw0W10BmJFY0bD/c8x3yPTrqmPVMgJXd7v9i3nUZ4sqE45ZYaPCcQgtctael+z5 yJHzV957dxizWxrauWwUDNZicp/WRIIjFdQNCbtHjC1BWCgY7iM6pP905WxUtgyL8SXL 8Bng== X-Gm-Message-State: AOJu0Yw1wLtqlaffn+fXJocpe+ZuazOHXk6EPH6wNcrXB/rlMXU3OGM2 sIRzILzdYcu/ct6EApepAE1+0ezF0IaxrsK/zEZJP6C+5QlilcpxD0w7suzl+zpdnNl/YoN6xPD x X-Gm-Gg: ASbGncvsA4E03k01TEiJtEXm1BZKN7xWRv//xuaD9dbl0FPE1ppbgQp/SxahZNn6aMz sfZ0TUQ6wZg8lF8VC0ae0wnAoHsXRLuxt/gQhzBEmSYZFTRVHt50/EbI2It0ZDXba1bsOZUDdjf oRpdvQGUhl/rt8vCoA2W/xw0WRIsgir+XAltwF5XxZ6oIPAxRlA7o096SQyOSJVu+AN8XObcwet b6AhGuSf7cy4/yo0RAXBlEE5IQ7AroSmGito5RqeMcke8/pRkJjc181UBbdqbmCtzeZLQ63+HZQ mlcpTBarEwVfM00Kx0U7cabVN0KMVqKvs6q2Jg+61ieQrAaEE8olUBZuP7CGkM/UPoqTd5ykJKK VNAI6HWx58vLq+WC7KVY= X-Received: by 2002:a5d:648c:0:b0:39c:1f02:5409 with SMTP id ffacd0b85a97d-39d08b10724mr516977f8f.9.1743724726256; Thu, 03 Apr 2025 16:58:46 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec364d071sm30461335e9.32.2025.04.03.16.58.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:58:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 03/39] target/arm: Filter CPU types for binary Date: Fri, 4 Apr 2025 01:57:45 +0200 Message-ID: <20250403235821.9909-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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é --- target/arm/cpu.c | 2 ++ target/arm/cpu64.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 377791c84dd..b1aa482c726 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -50,6 +50,7 @@ #include "disas/capstone.h" #include "fpu/softfloat.h" #include "cpregs.h" +#include "qemu/target_info-qom.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" @@ -2759,6 +2760,7 @@ void arm_cpu_register(const ARMCPUInfo *info) .instance_init = arm_cpu_instance_init, .class_init = info->class_init ?: cpu_register_class_init, .class_data = (void *)info, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name); diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 8188ede5cc8..9f8c98563ac 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -24,6 +24,7 @@ #include "cpregs.h" #include "qemu/module.h" #include "qemu/units.h" +#include "qemu/target_info-qom.h" #include "system/kvm.h" #include "system/hvf.h" #include "system/qtest.h" @@ -856,6 +857,7 @@ void aarch64_cpu_register(const ARMCPUInfo *info) .instance_init = aarch64_cpu_instance_init, .class_init = info->class_init ?: cpu_register_class_init, .class_data = (void *)info, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_AARCH64_INTERFACE, }; type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name); From patchwork Thu Apr 3 23:57:46 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: 878013 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529734wrs; Thu, 3 Apr 2025 16:59:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkuY0KY5U8HJ86JMwjTYp3yjMvzJ3EDhW87WosH+l8W+IWiWMcke6NjPrFPxhAsyHh51aAww==@linaro.org X-Google-Smtp-Source: AGHT+IFOYQGL2Kt+068wFU5B4h0VjijleQrneRDzaFt3M2Df+1AKe6+0kb4fcnR7o20rn+4l3f84 X-Received: by 2002:a05:6214:202b:b0:6e8:9535:b00 with SMTP id 6a1803df08f44-6f00df1f499mr19054786d6.12.1743724789955; Thu, 03 Apr 2025 16:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724789; cv=none; d=google.com; s=arc-20240605; b=Defk4U/CioWKRnpXPQQHgt6SSDSVT5Gd1IhyKdZJIMt6UMeaahj2G2QrCUS1cnJdis uDs3BhgiHiCkP73sPGB/done0tN8u4wnJSRB8AX3meStW6hXW77SRlyaiGBzQ5J2Zvjo IWpe13QuKcP973HxIHhF8lUDNEZgHHlMhlF1bzneSd+LJ47V8dxigPq4W2ABcwQ/63D8 LPpE3d/bL/G/udpGcZv8p7rbL6Sgfl1rMe8LBbdhqa+D39FGiA2YYT8UbB0Di6Uem8FN gpQjjKp/XvPnXuCrS/sthPRwVB/pjC0DelxR/YnvAzGycTvaeHiHOZPxWsKZh7Tve2AZ tuJA== 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=yHY3m/5NH5MFZKDP2KzFtiCvD+X/0rIoNr0k1W0yLjQ=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=Q9cGmjH4ml4pTziAcarREMoIDVME4Ez1dpNpBrIIy8WyyM6DvXWm1RXodEh1PsTh46 Vk4NgX9Bmp7sVuJyMe3OWsk2dosYdck5ye0oXpPpsmuoXkpeFOHJLd8zJnOlh63fzcvA 5IvykVnzgYI5AWT0sCAz35xs+FfQG4RBxmAu1/YvZkoLlJsGJoK+lgMmaK1gxhLJTGiX sazaaNKShuJCHxktjb0oI+N+aMUHDXK4GofeHg0gLgUtHYUDes18qN43DBAfTUufEKZy zhpp7rSHxyiDQtZMchjzf9zxjCX2x0waIOd3dV2ak8/aMUWw8QGL8W5ZBF2UGitBu26+ xwJQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kRVhJMVW; 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-6ef0f12a271si22252296d6.346.2025.04.03.16.59.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59:49 -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=kRVhJMVW; 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 1u0USY-0004dQ-9K; Thu, 03 Apr 2025 19:58:58 -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 1u0USW-0004Y7-EO for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:58:56 -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 1u0USU-0002Tg-2o for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:58:56 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39ac9aea656so1284996f8f.3 for ; Thu, 03 Apr 2025 16:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724732; x=1744329532; 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=yHY3m/5NH5MFZKDP2KzFtiCvD+X/0rIoNr0k1W0yLjQ=; b=kRVhJMVWQ1PQLCYStDb9oDZmOCZOVMDDOM02AnKFDwRU8G6u8jpQ4JYY0EVqkiGOcS 3X4n0LDIqRwpNKSjv6Pi+j7A4ugmIKDnVmKP29sr4XcLI5Vx9A1w4EtEGjLgIXUuX661 7cbpmQo+CnkMXfAifzA0uKikuRpVTMrjjAndWsdUsc/FWrpHMRfMsqhFIQ/VKznwmAxI 6MyhKgFsHk2exim8o9XaI4Iih7BewbwQ6UwG688dnztuWfqxOHvlporgjhLwLgxYV9QK s9jA0IQMrqQ9HR+DI0PJGzZVZ9NN1QWLysO50qbCnnA0KLctar0/P1iQAft2b/gjjrq1 BTmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724732; x=1744329532; 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=yHY3m/5NH5MFZKDP2KzFtiCvD+X/0rIoNr0k1W0yLjQ=; b=g/bkindPJDKw/eci0Iyd5YX1Brq4YuhNAE5AjGDx6HgWQOct1UWc345KPqV2lyFbxF zeQxkHz/5V+2NtQYLJVqJo1lL5f2uMfi7qMqjR0A47+k+MIpWpuumejGWgSHKuep9vUY O785fzM/lSs2S35YxwaIqixl1vZFmRz8nXFNbzfKfFr92Kb9hktUsjFe3+9nNbEgTJtc s+vpvJ0MwS2/YN22fGGEE5teXgH59mSQaWpeQV7IGU9ql1bvQZGUqYEbCSzHUapM2/il 2Ii/oQAgm3wAyYqBOuIGlhG6gCKKpIV4jFSG6PgH0zG+sdOWf6F66dMmb6ERvlFEH5+c oDzg== X-Gm-Message-State: AOJu0YxuASOTDZ637XruhE+/f4VTs1uk3Cgyj7hNf7ynaq4MFCPWZ+AX YgLZwHIj+eroTCwiC2uQl8EZ0OJuWeeBWxzXkIc5tNGGUzIsD2Oqm/LUmcfXBpyKUgMZeD5sopq B X-Gm-Gg: ASbGncuixb4jRL2M9mvJ8SxHBUdYx/Z+N8nHRR9tmaeVbtQC2qxvChbdLLu+1L/qKKG eZnhfh8nt6kkNFCJuBdDBQi3/Nk0GnzCzWoaVu5R21hkWoA60xDuwa6UW98ThXblLF2mhob30GK IoCxhZw1rJ5adRIQVd3vcwPFxdD1K7YrrNbPR+kAezC41fq0I66qufw8y+sysx0Cp1akDLJH7ga hFoZS4skq8MF7/5qRtUCMw2BbxXoZGUg6TyEpnFw11lvxIg2M/FZHgzTUYJPX4tRiLZZsbAD1vg mGHyqFyatdqm7KBGVkeHGV1uvYG75Y+LBYOinSq+wjFCvICFnZWpZVIiwCONCEUKNyre1zEjsqz y3sIHB564SYo4UkypXxA= X-Received: by 2002:a5d:64a9:0:b0:391:4bcb:828f with SMTP id ffacd0b85a97d-39d0de1233emr464307f8f.14.1743724732148; Thu, 03 Apr 2025 16:58:52 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a6608sm2949903f8f.23.2025.04.03.16.58.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:58:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 04/39] hw/arm: Filter machine types for binary Date: Fri, 4 Apr 2025 01:57:46 +0200 Message-ID: <20250403235821.9909-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/b-l475e-iot01a.c | 1 + hw/arm/collie.c | 1 + hw/arm/exynos4_boards.c | 1 + hw/arm/fby35.c | 1 + hw/arm/highbank.c | 2 ++ hw/arm/microbit.c | 1 + hw/arm/mps2-tz.c | 4 ++++ hw/arm/mps2.c | 4 ++++ hw/arm/mps3r.c | 1 + hw/arm/musca.c | 2 ++ hw/arm/omap_sx1.c | 2 ++ hw/arm/realview.c | 4 ++++ hw/arm/sbsa-ref.c | 1 + hw/arm/stellaris.c | 3 +++ hw/arm/versatilepb.c | 1 + hw/arm/vexpress.c | 2 ++ hw/arm/xilinx_zynq.c | 1 + hw/arm/xlnx-versal-virt.c | 1 + hw/arm/xlnx-zcu102.c | 1 + 19 files changed, 34 insertions(+) diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index c9a5209216c..f7fb6c54395 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -131,6 +131,7 @@ static const TypeInfo bl475e_machine_type[] = { .parent = TYPE_MACHINE, .instance_size = sizeof(Bl475eMachineState), .class_init = bl475e_machine_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, } }; diff --git a/hw/arm/collie.c b/hw/arm/collie.c index e83aee58c6b..c5bed6c7006 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -86,6 +86,7 @@ static const TypeInfo collie_machine_typeinfo = { .parent = TYPE_MACHINE, .class_init = collie_machine_class_init, .instance_size = sizeof(CollieMachineState), + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void collie_machine_register_types(void) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 2d8f2d73265..53b79b893d8 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -192,6 +192,7 @@ static const TypeInfo smdkc210_type = { .name = MACHINE_TYPE_NAME("smdkc210"), .parent = TYPE_MACHINE, .class_init = smdkc210_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void exynos4_machines_init(void) diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c index 6d3663f14a1..d4cc596fb67 100644 --- a/hw/arm/fby35.c +++ b/hw/arm/fby35.c @@ -187,6 +187,7 @@ static const TypeInfo fby35_types[] = { .class_init = fby35_class_init, .instance_size = sizeof(Fby35State), .instance_init = fby35_instance_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, }; diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 0f3c207d548..ea3621e4f87 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -363,6 +363,7 @@ static const TypeInfo highbank_type = { .name = MACHINE_TYPE_NAME("highbank"), .parent = TYPE_MACHINE, .class_init = highbank_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void midway_class_init(ObjectClass *oc, void *data) @@ -387,6 +388,7 @@ static const TypeInfo midway_type = { .name = MACHINE_TYPE_NAME("midway"), .parent = TYPE_MACHINE, .class_init = midway_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void calxeda_machines_init(void) diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index ade363daaa4..dd265d8cfb3 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -74,6 +74,7 @@ static const TypeInfo microbit_info = { .parent = TYPE_MACHINE, .instance_size = sizeof(MicrobitMachineState), .class_init = microbit_machine_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void microbit_machine_init(void) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index b0633a5a69e..1f0a431adc8 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -1463,24 +1463,28 @@ static const TypeInfo mps2tz_an505_info = { .name = TYPE_MPS2TZ_AN505_MACHINE, .parent = TYPE_MPS2TZ_MACHINE, .class_init = mps2tz_an505_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static const TypeInfo mps2tz_an521_info = { .name = TYPE_MPS2TZ_AN521_MACHINE, .parent = TYPE_MPS2TZ_MACHINE, .class_init = mps2tz_an521_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static const TypeInfo mps3tz_an524_info = { .name = TYPE_MPS3TZ_AN524_MACHINE, .parent = TYPE_MPS2TZ_MACHINE, .class_init = mps3tz_an524_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static const TypeInfo mps3tz_an547_info = { .name = TYPE_MPS3TZ_AN547_MACHINE, .parent = TYPE_MPS2TZ_MACHINE, .class_init = mps3tz_an547_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void mps2tz_machine_init(void) diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index 6958485a668..e4763add3db 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -563,24 +563,28 @@ static const TypeInfo mps2_an385_info = { .name = TYPE_MPS2_AN385_MACHINE, .parent = TYPE_MPS2_MACHINE, .class_init = mps2_an385_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static const TypeInfo mps2_an386_info = { .name = TYPE_MPS2_AN386_MACHINE, .parent = TYPE_MPS2_MACHINE, .class_init = mps2_an386_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static const TypeInfo mps2_an500_info = { .name = TYPE_MPS2_AN500_MACHINE, .parent = TYPE_MPS2_MACHINE, .class_init = mps2_an500_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static const TypeInfo mps2_an511_info = { .name = TYPE_MPS2_AN511_MACHINE, .parent = TYPE_MPS2_MACHINE, .class_init = mps2_an511_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void mps2_machine_init(void) diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index 4dd1e8a7180..e9abbf00b43 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -634,6 +634,7 @@ static const TypeInfo mps3r_machine_types[] = { .name = TYPE_MPS3R_AN536_MACHINE, .parent = TYPE_MPS3R_MACHINE, .class_init = mps3r_an536_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, }; diff --git a/hw/arm/musca.c b/hw/arm/musca.c index a4f43f1992b..5d63a4e9ec7 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -657,12 +657,14 @@ static const TypeInfo musca_a_info = { .name = TYPE_MUSCA_A_MACHINE, .parent = TYPE_MUSCA_MACHINE, .class_init = musca_a_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static const TypeInfo musca_b1_info = { .name = TYPE_MUSCA_B1_MACHINE, .parent = TYPE_MUSCA_MACHINE, .class_init = musca_b1_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void musca_machine_init(void) diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index aa1e96b3ad7..bb676f63eb5 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -219,6 +219,7 @@ static const TypeInfo sx1_machine_v2_type = { .name = MACHINE_TYPE_NAME("sx1"), .parent = TYPE_MACHINE, .class_init = sx1_machine_v2_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void sx1_machine_v1_class_init(ObjectClass *oc, void *data) @@ -238,6 +239,7 @@ static const TypeInfo sx1_machine_v1_type = { .name = MACHINE_TYPE_NAME("sx1-v1"), .parent = TYPE_MACHINE, .class_init = sx1_machine_v1_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void sx1_machine_init(void) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 008eeaf049a..f81d084eb80 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -431,6 +431,7 @@ static const TypeInfo realview_eb_type = { .name = MACHINE_TYPE_NAME("realview-eb"), .parent = TYPE_MACHINE, .class_init = realview_eb_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data) @@ -452,6 +453,7 @@ static const TypeInfo realview_eb_mpcore_type = { .name = MACHINE_TYPE_NAME("realview-eb-mpcore"), .parent = TYPE_MACHINE, .class_init = realview_eb_mpcore_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void realview_pb_a8_class_init(ObjectClass *oc, void *data) @@ -471,6 +473,7 @@ static const TypeInfo realview_pb_a8_type = { .name = MACHINE_TYPE_NAME("realview-pb-a8"), .parent = TYPE_MACHINE, .class_init = realview_pb_a8_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void realview_pbx_a9_class_init(ObjectClass *oc, void *data) @@ -491,6 +494,7 @@ static const TypeInfo realview_pbx_a9_type = { .name = MACHINE_TYPE_NAME("realview-pbx-a9"), .parent = TYPE_MACHINE, .class_init = realview_pbx_a9_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void realview_machine_init(void) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index aa09d7a0917..112cbbf29e6 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -920,6 +920,7 @@ static const TypeInfo sbsa_ref_info = { .instance_init = sbsa_ref_instance_init, .class_init = sbsa_ref_class_init, .instance_size = sizeof(SBSAMachineState), + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void sbsa_ref_machine_init(void) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index cbe914c93e9..b901683f78a 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1475,6 +1475,7 @@ static const TypeInfo stellaris_i2c_info = { .instance_size = sizeof(stellaris_i2c_state), .instance_init = stellaris_i2c_init, .class_init = stellaris_i2c_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void stellaris_adc_class_init(ObjectClass *klass, void *data) @@ -1492,6 +1493,7 @@ static const TypeInfo stellaris_adc_info = { .instance_size = sizeof(StellarisADCState), .instance_init = stellaris_adc_init, .class_init = stellaris_adc_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void stellaris_sys_class_init(ObjectClass *klass, void *data) @@ -1512,6 +1514,7 @@ static const TypeInfo stellaris_sys_info = { .instance_size = sizeof(ssys_state), .instance_init = stellaris_sys_instance_init, .class_init = stellaris_sys_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void stellaris_register_types(void) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 35766445fa4..3cfcd56f06b 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -452,6 +452,7 @@ static const TypeInfo versatileab_type = { .name = MACHINE_TYPE_NAME("versatileab"), .parent = TYPE_MACHINE, .class_init = versatileab_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void versatile_machine_init(void) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 76c6107766c..6cd8c42925b 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -850,6 +850,7 @@ static const TypeInfo vexpress_a9_info = { .parent = TYPE_VEXPRESS_MACHINE, .class_init = vexpress_a9_class_init, .instance_init = vexpress_a9_instance_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static const TypeInfo vexpress_a15_info = { @@ -857,6 +858,7 @@ static const TypeInfo vexpress_a15_info = { .parent = TYPE_VEXPRESS_MACHINE, .class_init = vexpress_a15_class_init, .instance_init = vexpress_a15_instance_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void vexpress_machine_init(void) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index b8916665ed6..8f2f0f35ff3 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -480,6 +480,7 @@ static const TypeInfo zynq_machine_type = { .parent = TYPE_MACHINE, .class_init = zynq_machine_class_init, .instance_size = sizeof(ZynqMachineState), + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void zynq_machine_register_types(void) diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 0c6f0359e3d..e19c4d9ef58 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -833,6 +833,7 @@ static const TypeInfo versal_virt_machine_init_typeinfo = { .instance_init = versal_virt_machine_instance_init, .instance_size = sizeof(VersalVirt), .instance_finalize = versal_virt_machine_finalize, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void versal_virt_machine_init_register_types(void) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 4fdb153e4d8..88b1eafab4d 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -303,6 +303,7 @@ static const TypeInfo xlnx_zcu102_machine_init_typeinfo = { .class_init = xlnx_zcu102_machine_class_init, .instance_init = xlnx_zcu102_machine_instance_init, .instance_size = sizeof(XlnxZCU102), + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }; static void xlnx_zcu102_machine_init_register_types(void) From patchwork Thu Apr 3 23:57:47 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: 878015 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529755wrs; Thu, 3 Apr 2025 16:59:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWAP0fnA35hay6WQkw0N6sePnUpyZTN8zwLO1AkKJo59htaROwnEi6Kvqqsb6B6YuRB2+l8hQ==@linaro.org X-Google-Smtp-Source: AGHT+IEKc9z8bpiA6cora3NQ/aixqzMSiQb+Cgtr9NMsvm8cgYwgY9r4Qgde2VLRBSt7lzg8ui3L X-Received: by 2002:a05:620a:430e:b0:7c5:6a40:6a7a with SMTP id af79cd13be357-7c76c96c404mr846321985a.6.1743724793529; Thu, 03 Apr 2025 16:59:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724793; cv=none; d=google.com; s=arc-20240605; b=UVMEldtR/PfyEj8XxgSzCOEgJhi2sVb8gzAsxsUPEkUds88ubnf8sUAagqwPU6CyfF x+9WO1BJbsuUR+YoPQJ7g1YX+HMSeMYKEwh/zTGzVKLJSCTcqyLu4MFbSS5K8oNo8uD/ ygpytMEqn+1AMPgWLCBksluzB20G6IDvNEnQfgAspgNHxdKIqBzmH93dBrtEUpJYhUKn DV+V+PdJCpwwl65SmrDfVUGfeHtj+T6LDAVtRR9FQSwjZowrAa3vl3BmmNzYPDDLwZ76 6Qga/ZE9ww+t8Pq2CE7Fh5hwyznWMHq3/6G57ruoEb+3/vVLpZzV3wrET9x3FZpsKIiu 3XAg== 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=FbGR6HcarXZRF0Z/seWcmwBS3azqrrXZgIvCxgRC+K8=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=Wk28t2p02ydn3TrezDLjYQqeD9NtmnJYzfAxilTOJTuxPouh1et/9E12zMAEBQmp/v NNzgfb0yH8+9CUpNtSuU7hcLyk+wDlXF5xUOMq/8iUIiY8mAzrnNH765QLPhVGXcoHLP CPzyn36ss9QKgG8SdJFt+hTEf9yqzupIKpcroOKJHmbDKqACNSI7J1SayoylJDmaJmlY lyOCiT7NttDeW6uwI0NUGvg63sINXcvpW2u0mRfDV4FX5UGzzpnz2EQnfw+8UcDvnB57 V/eqdOS5O1wTLoTZQJ6NaCqCJB/LbOV4k0H4+OrPS1OobF22GUjszriWyWL24ELPT7jg f7cQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ulhtnlz5; 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-7c76eae27eesi205929285a.637.2025.04.03.16.59.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59:53 -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=ulhtnlz5; 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 1u0USd-0004j5-Ga; Thu, 03 Apr 2025 19:59:03 -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 1u0USb-0004hL-LF for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:01 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0USZ-0002Um-RO for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:01 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-391342fc1f6so1230499f8f.1 for ; Thu, 03 Apr 2025 16:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724738; x=1744329538; 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=FbGR6HcarXZRF0Z/seWcmwBS3azqrrXZgIvCxgRC+K8=; b=ulhtnlz5B+hUUHUvKkFZYMIMGunjXE5R1bd7V69YEKgw+H0yCrl48XvEzM7sas0vjc CCvhi6AtY6hSnblRWMpOTeShEzylGrvioQoxL8CSBIUPjOXUewsfNIvl0rQ9ZEyZ7w2O vS6IsUuhsKiWjUS68nktC3bPRMDPlkUAbnM34DXcQcZ0nBB+eX5iF5nCeI2z4XSaLhCr bj5ah+iuXtgAvDlX8qsVpRbPvrod3tx2v8yQJirZ6FxtoxGuEicYr6YkEfU17fO2nNkc Q5Gy9p6n5yDYutkW51bG5EL3I2fOlAhaLgvOfTV9KpzSgzD5g1OSkD4jKnmgGD8YPMEO BTmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724738; x=1744329538; 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=FbGR6HcarXZRF0Z/seWcmwBS3azqrrXZgIvCxgRC+K8=; b=Zil7Q9fP8a6+s+TlygBSJczVd537SjciS4cJGHZzveW1KAn8kPmi57maHaNQve7jD6 1lKwhaeNLlWbsgLLkmzoAKQpl3gC/zcYmOU010G4WQ5neV0AH9qpowOp6TuGNl4UXhwQ oLUQf45UkAkkVrlF5R0iCjmwizA3p6I5e5JFtns2TH4hE8T0+RIjJxGrOv5o6t/rM3Jw KtymKJzT54juVEhyfSgU3bAGox8QeFCtEXt5XUXcY2gySpibVM+cfATPIUqDjcZX9ksN 26nYQxsLpBn8Hw8hJQPXLJk9z0wkr1CGjXSNCw1pEdkaGsyT/IaC9dAxrZ8Zx0b0Z2BW +TaA== X-Gm-Message-State: AOJu0YwSfA+g8+KMio5FWH4o6TAmCkBCRrcgmp8q92ngUY901n24JOB6 EdnrAYzYfa9mPMpR7q2w9ywITBxXM5RCE7L+uHJcsc3Mrcs4pDSvXkLeh+ecrPhauB95MRWPPyl a X-Gm-Gg: ASbGncuGXf42QIC3P12rmZGs/5xE0TFodD3xuKNOfro9VDJVGTol2m+mxyGSjwVEKS3 xamg2hLh7HkiMrRzddprrZ4obFX3heJyIuKmVXSG46lEBlEVdUWou47Q6iqi5cD01oJP8SsKeWY th1H6me0BDGvrir732tGtHK75e7sCQWFYc8RdHtCCYm+JtpMinoG1usq0QfMi8yWAcW0PDK6DJI vLRsCnSQEgEAuh9Jyq1rYyOfbsFuA6I2jyyyrhLgmm0OMMLGzfnyc2HfsQEcf5yRKWqXTjsqyS+ skk2rOnTr7W68T+u7K+iMqOZnke16Ef676A/Rjw8RaFEeOJdmq58LP1rN1PcFu9cPklSZ71doMK EhaggOqOD0NUgTZJXBjo= X-Received: by 2002:a05:6000:1a87:b0:398:fd9b:b935 with SMTP id ffacd0b85a97d-39d1475794amr493496f8f.53.1743724737999; Thu, 03 Apr 2025 16:58:57 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c30226bbfsm3029928f8f.90.2025.04.03.16.58.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:58:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 05/39] hw/arm/aspeed: Filter machine types for binary Date: Fri, 4 Apr 2025 01:57:47 +0200 Message-ID: <20250403235821.9909-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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é --- hw/arm/aspeed.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 82f42582fa3..245f961a868 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -179,13 +179,11 @@ struct AspeedMachineState { #define AST2600_EVB_HW_STRAP1 0x000000C0 #define AST2600_EVB_HW_STRAP2 0x00000003 -#ifdef TARGET_AARCH64 /* AST2700 evb hardware value */ /* SCU HW Strap1 */ #define AST2700_EVB_HW_STRAP1 0x00000800 /* SCUIO HW Strap1 */ #define AST2700_EVB_HW_STRAP2 0x00000700 -#endif /* Rainier hardware value: (QEMU prototype) */ #define RAINIER_BMC_HW_STRAP1 (0x00422016 | SCU_AST2600_HW_STRAP_BOOT_SRC_EMMC) @@ -1663,7 +1661,6 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc, aspeed_machine_class_init_cpus_defaults(mc); } -#ifdef TARGET_AARCH64 static void ast2700_evb_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = bmc->soc; @@ -1713,7 +1710,6 @@ static void aspeed_machine_ast2700a1_evb_class_init(ObjectClass *oc, void *data) mc->default_ram_size = 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); } -#endif static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc, void *data) @@ -1760,92 +1756,112 @@ static const TypeInfo aspeed_machine_types[] = { .name = MACHINE_TYPE_NAME("palmetto-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_palmetto_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("supermicrox11-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_supermicrox11_bmc_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("supermicro-x11spi-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_supermicro_x11spi_bmc_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("ast2500-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_ast2500_evb_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("romulus-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_romulus_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("sonorapass-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_sonorapass_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("witherspoon-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_witherspoon_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("ast2600-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_ast2600_evb_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("yosemitev2-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_yosemitev2_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("tiogapass-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_tiogapass_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("g220a-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_g220a_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("qcom-dc-scm-v1-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_qcom_dc_scm_v1_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("qcom-firework-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_qcom_firework_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("fp5280g2-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_fp5280g2_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("quanta-q71l-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_quanta_q71l_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("rainier-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_rainier_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("fuji-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_fuji_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("bletchley-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_bletchley_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("fby35-bmc"), .parent = MACHINE_TYPE_NAME("ast2600-evb"), .class_init = aspeed_machine_fby35_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("ast1030-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_minibmc_machine_ast1030_evb_class_init, -#ifdef TARGET_AARCH64 + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("ast2700a0-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_ast2700a0_evb_class_init, - }, { + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_AARCH64_INTERFACE, + }, { .name = MACHINE_TYPE_NAME("ast2700a1-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_ast2700a1_evb_class_init, -#endif + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_AARCH64_INTERFACE, }, { .name = TYPE_ASPEED_MACHINE, .parent = TYPE_MACHINE, From patchwork Thu Apr 3 23:57:48 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: 878009 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529690wrs; Thu, 3 Apr 2025 16:59:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXrIpx5LydnbK86zDVzu7aZaSGNlTo7kFjJRcs+G1iAMpZz97JUMnld8aDResElUzjLg5IzwQ==@linaro.org X-Google-Smtp-Source: AGHT+IHqAQzP78EwABf+mUyGNvfWw5QI9YpTOmgEzmP880n70VvkcPzY9L2S+5Btl9QOW4o4fpmd X-Received: by 2002:a05:622a:314:b0:479:1a3d:25c2 with SMTP id d75a77b69052e-479249d5be2mr20682351cf.44.1743724785377; Thu, 03 Apr 2025 16:59:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724785; cv=none; d=google.com; s=arc-20240605; b=KDjE8nsqH3hPv0wwgWSqrqlU7G06iQrNhripFIrSkbVNksxDF1uegcjDnicp2S7z70 ThXqiAbH5h06aTZ1fpoIbjdhLfsxu0S+QrGSa2N1l1jdOrS3ld5kzHL9hDlsG/30i2YB Qc3R9gzxCRvqd1UVpaV9dhw/6xCtfQBawfNHwKYYLE/5mxAw22tZ3rW2Zoc31EjHLh3V DhGPzVNActJGbUUV87mm4BgApqvdngZPqdDvCpZQIleCSoBo3lbQHEX01boNc6MyYZWO rLez6ENQHY1uiAR/bHcqIYtFLWiwi+6IQG/up+v7ktMzPVLPs7yvkBcfDantUofs9He/ Qacg== 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=8RQZgbk3//J3BzxedrkZtFYJhqEG+znG9jdEhZN1pWQ=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=I8KLJqNUNgMjAvtepYcCE1CvdQEoTjBM5NiiIe8qf88gGHo1jIwz898cv6Lb6/ftsX SAySYvjoUEcfb7cfISbhfotOwG4h/aOUD+iT56gHQiHSuxhdThX/yrZNEzvdlO4XbsWZ oI7tQWgyXLTUi6zWGiesi4/UFKgLv0vIbYVTgOREt9mNGn/mjmITnELeRjwWsYZompFY lAeu+hSGD/jwlx/4llENCwz9k1XdSIoAtw7+P1A5zBNRBRZ6hpSKBxCOUPhpLjtstSlj cPcIAVDSD5XS8WtV+yMXmfhPoo0n0OG0YFTS/kQxnd1XPmKYBZKsUpINs6MgKwev2AaT NVVw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O0pfH07Y; 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-4791b173557si20442971cf.243.2025.04.03.16.59.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59:45 -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=O0pfH07Y; 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 1u0USk-0004r8-Gd; Thu, 03 Apr 2025 19:59:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0USi-0004mU-A8 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:08 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0USg-0002Vp-IU for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:07 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso8414365e9.3 for ; Thu, 03 Apr 2025 16:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724745; x=1744329545; 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=8RQZgbk3//J3BzxedrkZtFYJhqEG+znG9jdEhZN1pWQ=; b=O0pfH07YSLjXQdFVyrD79VkkVzRYrq2wQmI3i9Z4f2aSUJfUgjwLVKlQh2jRdIjuJ2 OM5P2KnpFsFvtXegjNKDmHvIwn9Zl4XRTrOIBTHBy+33H4vi5pN3hSLv0KiN3/yx1vtZ yBuiNOA1GagOJ2xxxc7brC31LXzka5Sx1LsUBtAzbyWrDYIzfUpNI/qGXo09D182Y2Zv o/wuZ0Rp8u5UyV4hiWjGhtXjcuH/qu7NezryNXMsyPQdwhVskrinilozvkmZ8rSaSNpN zHzBrhaD6ac/yyBkv7A5KKv2WAXVtDq1jogqleWs6HmAwl4Fc8+s6T3tYfYflVKKb3yl L+ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724745; x=1744329545; 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=8RQZgbk3//J3BzxedrkZtFYJhqEG+znG9jdEhZN1pWQ=; b=UrgUScRqs0xw49d7rcI6+tK0FlAfB4qiNR7c/E0mh7ExMHUV9KwoJON7SYON0hTI3Z dAKpLoO9epeSGVtK6diIVfWwHzaQNaoDEVZxnke7nr/wCwBqrY5bbvGanL8PISm4yRKr 4oUwmSXJesipKNX7MeEgIO2dY8gCSSQApJYnE7gmb+2rd4f6qIM8wOHvHP29C5BR3avX 5lhsco6A7idCMHhavmeYgIcRms3+VmzduE0ZlVVssIjVq/j1oCnz9VOJdB1MDUfb9xHr zORRUayCGy/bUBpdq8ufb9yP1kRQSDa8kHmGRCzdFz6hn7pstzKcoGU+Lq1Mqxi0MTnV Rqmw== X-Gm-Message-State: AOJu0Yx48qrI7tnAcBVwncfQVCU2BpFTeawgEmKjxjXyD0eEEQMVizDh mPEjous7iyJsypuCJ+NI7e5gW0YlSGC7SqrLSJDMeL0MqidaVESd2mrgIHV4cAo/xKhDoCgzzRY g X-Gm-Gg: ASbGncu2iVjii15sNUW2PzHeDPJrrbfjwWT1GEyE2nsBkXw1QJrFNN6HJWCNaDTy2wS HWc5iXIhixxhO5zAPuV51QsJ+9unDBDEqt3e/9WYm8o64B257bvglR9HTc17SH7m6zws39hAD+8 pHrH/NyvODS3eV4uPSvSoYbwjSJtGqUm9eZ1upXYQuBz6T7fkMWxS02HHAprPNTIlmJSlg7piyz /t1icGl/mq97RYLvscz3+RrOtwZpGQC52GKZ9hcuNBDvp+CfWwMPP64N/IvNurKFyH6XGH/yOrL MQkrsxbmaiZv1kXrlKcVCM9kFI6bGp15b7RIZGJmx/gv4VT3OXtTqRT1W9MO7NaOGSKTRfcSPmH fufXPAEZltuyFBAW6J9vqRKoO5AJpLA== X-Received: by 2002:a05:600c:470d:b0:43d:94:2d1e with SMTP id 5b1f17b1804b1-43ecf89d169mr5826665e9.13.1743724744629; Thu, 03 Apr 2025 16:59:04 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020d66csm3067173f8f.63.2025.04.03.16.59.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 06/39] hw/arm/aspeed: Build objects once Date: Fri, 4 Apr 2025 01:57:48 +0200 Message-ID: <20250403235821.9909-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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é --- hw/arm/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 09b1cfe5b57..f76e7fb229f 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -39,15 +39,15 @@ arm_common_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'x arm_common_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_pdk.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) -arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( +arm_common_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', 'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', 'aspeed_ast10x0.c', + 'aspeed_ast27x0.c', 'aspeed_eeprom.c', 'fby35.c')) -arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: files('aspeed_ast27x0.c')) arm_common_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) arm_common_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) arm_common_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) From patchwork Thu Apr 3 23:57:49 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: 878062 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530167wrs; Thu, 3 Apr 2025 17:00:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUnuV6Vk5U0p3KFpjMn/QpX+G8FSd2ilDFPBICU4qc0t05JWTqpYIwAPCRv2ydVLQuWQq/dwA==@linaro.org X-Google-Smtp-Source: AGHT+IFdRGzlewL28wWUYLXTTFRY30oGVlh9BJEpaRG/wHo7MIZwlMCtuE1/jAjaUGkYPtKGOvrb X-Received: by 2002:a05:620a:3908:b0:7c5:5585:6c90 with SMTP id af79cd13be357-7c775a0f671mr118175185a.17.1743724842270; Thu, 03 Apr 2025 17:00:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724842; cv=none; d=google.com; s=arc-20240605; b=fE7gOsd807KYhvjiqoOb6wCI6+2JchMKjKq29wXjVfBsWpHIQpKMjin9jSKuuoBYHI Cl0DbyeJOQmK6+4sYcz1I0EMQSJGp9CbozA50KQQK4KDCIzwDBcEBl3bIKzvSc5Ci7Dx dXfvbAkop0B3l5AXhuIiD7OIEphPkoYXvYjB46qlugWFBRhp90GVNHdGjM89HICbqtW6 Wl8ygs4QWArJFTqVR45sFcZBxE0GsGOCusvww00zMRkTRJdv5d8WnuskKCY44mMrB7Th rhDr3AZ188DT8IVMS9n6PLS5ljtPe31m2fYMe3rJTAQrxzvaWry58Nyk6wmFJaZXu65Y t1EA== 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=Nk82sPbCU65CifIvDQtlnTBY33DI4NNrcma392a9X2I=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=EKDydw1pnGnS7nYJjnVg44LOgxkj2xvtryVCR1K3Aew7haF0TKKShtu5ETo2O+eYV4 XI2mXrxcU59n0vu7dVXHcTeOEOFvyhR4/PiW/PeAddndNrN4yh9xEzrZKLZNJgAfa9ma 1GpXaoedb4RXCDhtBtDuUugvaBgSR+lyUDRdUdZVln28DMKdMrRQKHB7a9h32ZTR2Qk/ 7j0slRZOoY/fGABuS7iZ8Yx78C2MapeehfSTz1KgKVUiDkKFU2YU8wvfvwtFBfEt9Uao ATeE7uQOVL2HiPltdDK013SGuN3OQQJd7mLZBJ3nQkg8KgWAtQSYB7bNX0Yi33qTEeEm jzLQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EpY5f3QK; 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-7c76eac76e1si203412985a.585.2025.04.03.17.00.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00:42 -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=EpY5f3QK; 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 1u0USr-0005Au-4b; Thu, 03 Apr 2025 19:59: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 1u0USo-0004zT-F1 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:14 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0USm-0002Wr-Ot for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:14 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43d0782d787so9568595e9.0 for ; Thu, 03 Apr 2025 16:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724751; x=1744329551; 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=Nk82sPbCU65CifIvDQtlnTBY33DI4NNrcma392a9X2I=; b=EpY5f3QKztiMzv1OrBUkqE4oJ4K/JXnFh9618xZdoiozzghAHw+Kv+BMRBftXQLBev su2B74bS0pGt80iIciyOGxfbpA4n9bYK53vT+U76tMAzGukBCJiAoSzrcn1+3WRmGYCn 92F8zhM86KHj/9jCN9nulcPaGUbV+9Vxj6pX7yy8OLRL2fAUC90nSw7zZWBpKQBq0K1I SoYn/1UVhzsLWt/2sVXq1a1jgIl9m+6UttdGLiYCcdSBM+OPtrmKrkTKCpla2+meZNot IVnco3VlVFZCaVomgy9xuTp862KO1LWUL57JHTO5PfiZlKj53Fk5AW2Xpky5wKadX8G8 kchg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724751; x=1744329551; 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=Nk82sPbCU65CifIvDQtlnTBY33DI4NNrcma392a9X2I=; b=NHo0XUTieRqYCDcNOgKM5pnCuwpwwfg5QEMwJLXUQfBv9payknkqTptwZgsrz/HZzZ 1wRzCEPITNDHq/BsXLRtDhJ2sthGeu098BfTxQaeQh5cmc39craWRUAF/cZnbaTc8rA6 xA/hhkNs0U6jqppPJe4Ay7g6dtNvD3TH9IG1iD+FmuOWabxjkNE7/S1+riDQpvhePXq/ p9fzmKUhczZAtG8gu4N4RtiUx0DA5pxocmSJn85x7Aym61lvWm3Ri7K0QNrTvgSOOOSR FBTz8a8a8k/Tca5JmeNDn3gvHqfbeyIhoktHaB4PtnhFKhClG1eWwqae3I4NDYEFuHnQ VzYg== X-Gm-Message-State: AOJu0YzY0FsevxcPEt/K+HSdTNWRtK+Z7fO0qW9/ZhBb1EgBtxl6+kfh zq9rsEmminTZARxDH4AcLKSQRsF79Rhj+X1tC7VIaGuzNJvPxnR/RsrpRYSe1ytKy2bCBHYpSAm T X-Gm-Gg: ASbGnctIOkX3/GFGdByAA/sM1iAHSymPg1uFr7HThDHHQneD/g3o0MjOR5HsSeXu8Bz J6sgS/EjXRewBmaNakdw6YIF1AGlW8vM9n7v6ymbfiMQ7iqwDvHZARQUFkWtqG3tVXKfZ4yszZM ua7SOIxAsB18djsRxzrDPna9T81RgTq3ivIaheglxnIpoPXIio5c6lFQu42Vp2V/ZD+ho40d+7X Kq5t0p4md/3zSWjA1liWMcxaTH2FYeTwbKr/W8WHOlmgLj1qhdtAPaCb7EvFw9lUi2SgzBp1I8e X9gZ/1UgC4L3u5aChCxsgy7rgfkd9A7ZPk8NE6rMHwNTPT4QSLbPhexqSZC2uRv9cj4G3qyk/eL YN7NyKJad5OpYG9VKNKI= X-Received: by 2002:a05:600c:5843:b0:43c:ea1a:720c with SMTP id 5b1f17b1804b1-43ed0f87ebfmr4271615e9.18.1743724750878; Thu, 03 Apr 2025 16:59:10 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec36691b3sm31259035e9.34.2025.04.03.16.59.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 07/39] hw/arm/raspi: Filter machine types for binary Date: Fri, 4 Apr 2025 01:57:49 +0200 Message-ID: <20250403235821.9909-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/bcm2836.c | 4 ---- hw/arm/raspi.c | 9 +++++---- hw/arm/raspi4b.c | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 95e16806fa1..7dd81e8e0f9 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -195,7 +195,6 @@ static void bcm2836_class_init(ObjectClass *oc, void *data) dc->realize = bcm2836_realize; }; -#ifdef TARGET_AARCH64 static void bcm2837_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); @@ -208,7 +207,6 @@ static void bcm2837_class_init(ObjectClass *oc, void *data) bc->clusterid = 0x0; dc->realize = bcm2836_realize; }; -#endif static const TypeInfo bcm283x_types[] = { { @@ -219,12 +217,10 @@ static const TypeInfo bcm283x_types[] = { .name = TYPE_BCM2836, .parent = TYPE_BCM283X, .class_init = bcm2836_class_init, -#ifdef TARGET_AARCH64 }, { .name = TYPE_BCM2837, .parent = TYPE_BCM283X, .class_init = bcm2837_class_init, -#endif }, { .name = TYPE_BCM283X, .parent = TYPE_BCM283X_BASE, diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index dce35ca11aa..b049c6035d4 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -367,7 +367,6 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data) raspi_machine_class_init(mc, rmc->board_rev); }; -#ifdef TARGET_AARCH64 static void raspi3ap_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -387,31 +386,33 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0xa02082; raspi_machine_class_init(mc, rmc->board_rev); }; -#endif /* TARGET_AARCH64 */ static const TypeInfo raspi_machine_types[] = { { .name = MACHINE_TYPE_NAME("raspi0"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi0_machine_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("raspi1ap"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi1ap_machine_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("raspi2b"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi2b_machine_class_init, -#ifdef TARGET_AARCH64 + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_ARM_INTERFACE, }, { .name = MACHINE_TYPE_NAME("raspi3ap"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi3ap_machine_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_AARCH64_INTERFACE, }, { .name = MACHINE_TYPE_NAME("raspi3b"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi3b_machine_class_init, -#endif + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_AARCH64_INTERFACE, }, { .name = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index f6de103a3e1..12c7ed42ced 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -127,6 +127,7 @@ static const TypeInfo raspi4b_machine_type = { .parent = TYPE_RASPI_BASE_MACHINE, .instance_size = sizeof(Raspi4bMachineState), .class_init = raspi4b_machine_class_init, + .interfaces = LEGACY_BINARY_QEMU_SYSTEM_AARCH64_INTERFACE, }; static void raspi4b_machine_register_type(void) From patchwork Thu Apr 3 23:57:50 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: 878010 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529696wrs; Thu, 3 Apr 2025 16:59:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWiD4SzlunUq1TZim6T11roK2UuW0U2TVjHxorkIsth/USkca8iEJJEhKgBUuCroPydIzBsvA==@linaro.org X-Google-Smtp-Source: AGHT+IEDUzji2r2EAYYEqVeUj0W/X9cd1j2WF/RwOQmFHRv4DSY+V3NfUeUBN0tZA/C9e4ZAltM3 X-Received: by 2002:ad4:4eed:0:b0:6e8:ee44:ce9f with SMTP id 6a1803df08f44-6f00df13ecfmr21646946d6.20.1743724785879; Thu, 03 Apr 2025 16:59:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724785; cv=none; d=google.com; s=arc-20240605; b=Qb50F/gmbp9C2+g7zCXJU1Twwv9qT1vkTdvZSBLrbXGe4af2tlM4aKfUeRWnuaj97L ZHCcUeVAHGhbz4I9TaxTdLk5GRK6M8lkDadVRoV9SdRKejMy20w6DZ0duRF+6Fzifa+y Sk5eKFGrKw75IxBUQWdFHAyBCQU/idOiF+IDsF1Tx3tpWykGXMYXi3t/Jc3KyMzQ/pqN m4WycmDfWSGuqXm2xMQR76jt4t7ltPcU+mUFTPYRjqg0M10b0IhKvrNG6gakXczX4r0C ZX5vC95WY+KsUbuKBM14F+0aXByAXKfdCOGoXMcHlAFwgHMbY6f64qQtCTguvb4jOlFM iutA== 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=MCDIwE5yiT5/YaudRHiQiWyT+TmWH+fJEge5GlDyh2k=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=NJ6G6dXyDhedMI0y2BElN5gEAo9kqV9htYmv55gMo2uMdYqaUu7jHmOYmrFIw6AUg2 k8ceo+QubAoCGcU0mY3ly/x60Zr0fLtp+G260q5muEUVQEp2qn7svGyrcwjlZapBm5y4 zPBxq4z+PZJZT6KuuxeCAOpLq2KDt0+j2A2D0hbxTY/bubpLnO0tKwkAaVQXOW34h+O/ CC2cf/DYBtkSln+locqh19pQkKW21evseG4py/9/zeuPGFxkir6XynRsdkorXKNugHHx mbJh0I4Ra3hGEYt36dXDsCctyNsUbybvtP/ewD3ujXlTZJqDpDjXnXeJRYYwQQxZy/sW mDuQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kBHaxrD4; 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-7c76eabfd4asi205202185a.464.2025.04.03.16.59.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59:45 -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=kBHaxrD4; 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 1u0UT1-0005Tn-2m; Thu, 03 Apr 2025 19:59:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0USu-0005K0-RT for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59: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 1u0USt-0002YD-DC for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:20 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso9328725e9.3 for ; Thu, 03 Apr 2025 16:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724757; x=1744329557; 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=MCDIwE5yiT5/YaudRHiQiWyT+TmWH+fJEge5GlDyh2k=; b=kBHaxrD4rxnJG5eJr19MWuAqd06lQJmES3VbvCCljXhMObCh8rbrrVdBlEZlWnehwb 5mYDaLr2SFw1In8Pb5GMUGMlmQ4eiinveYVW+sC8MRHQOC/L45HP+Y/rLw2o98g8vp3U yeFmXeN1/3uRREp2EaR8jO+kNAfTHyQmXLZpDA8WBnoz3lpgBYnnmQUgtJBirM8A2T/l zbsKR0QCBmmRChcp5tc1+q9ytG1Em4GwaLYne1aNNvQ5LUGKSEURTiZg7vBXQ+hb46Dg ABlMH2MqWnYCPRXwp05e5tM1aPvVxFtlVE7WBKuHoptCfejDM9k15qG1nVsIr/oZtALu Q0DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724757; x=1744329557; 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=MCDIwE5yiT5/YaudRHiQiWyT+TmWH+fJEge5GlDyh2k=; b=PqHwYSR8qKNzd5atJQbc/h0p2aGvncHUs584NowlYIPX3pmQGscWD9EAf+1kXA5ySn qmag4fIEDwg8zFpo6hCXNLkirYMhnuSYu6IMdeYwwdo8Q7sWb3DRsaQvRsf0BoGpYcQ1 mM/+2+OesBOHbfG6tcfX4fgbR+69N6YFqkkHDgBrKtNzBhQPBuGEO9nUZeZCt1Qxb+fb lU7NUQ4mtTnfqRf6Wxw4+OWe9hOejivQqI9R9on4QBP9y+Fl4P8qRz7aFWYcnhJBSVO0 EqDzxqlFTODt7816XhCZnzwwsRKB1sofBPhjZ6NSiThZYMaVqfdez8mOk59Ff5c0Ta4a QyEg== X-Gm-Message-State: AOJu0YwdFcvmBqJGtNqNf43DGPkMv0saaWuY9zbRHiAeL+9b0Ar4NZ/A Ja369nmDXcfO67IcQGhm87lrmmkbGAJZniezxN9Oy6ZjBN+4F37/HU2jZBtRo40QvPgVPWoXHfd Y X-Gm-Gg: ASbGnctVLMZCjH9SJiKCjdqJWv013FEph3YynoU+yqBFXs71MO79wZGMtk35NYslQJp hX/lHjYvawSQ/ZTtOQDbx6mKQhHvoZEjh8qv2YtI9SMeoECb32FAx+Wgy6yxSNdtefAbReCMzpi o0yXDS34E5z7ghXben76sWESuZo/1i6VqBEXb3PrtH+vlLNOYyD58loFmVNUi+apWE5B+mBQqX4 6wqq34ft+1/e6qGNt7qiUHuXQvvLEP0hjNr284F2xOS6z0/gb+a8sPwGfhDDwLP9KV8S5rNQwwg QslSarG3X0401lUeUe8YxfwIM6wGtImtsubYKncoVm49zPaaG25eXxDmQ0r14FarjKDPkNDaF0O U1i3FRFjI8Cf1X7ROPCc= X-Received: by 2002:a05:6000:2406:b0:39c:12f2:4b7e with SMTP id ffacd0b85a97d-39cb357588emr865665f8f.9.1743724757538; Thu, 03 Apr 2025 16:59:17 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec34bf258sm30605645e9.23.2025.04.03.16.59.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 08/39] hw/arm/raspi: Build objects once Date: Fri, 4 Apr 2025 01:57:50 +0200 Message-ID: <20250403235821.9909-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index f76e7fb229f..f52034ff6a2 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -27,8 +27,12 @@ arm_common_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubieboard.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40.c', 'bananapi_m2u.c')) -arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) -arm_common_ss.add(when: ['CONFIG_RASPI', 'TARGET_AARCH64'], if_true: files('bcm2838.c', 'raspi4b.c')) +arm_common_ss.add(when: 'CONFIG_RASPI', if_true: files( + 'bcm2836.c', + 'bcm2838.c', + 'raspi.c', + 'raspi4b.c', +)) arm_common_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c')) arm_common_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) arm_common_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) From patchwork Thu Apr 3 23:57:51 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: 878056 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529862wrs; Thu, 3 Apr 2025 17:00:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5LwmoT3yzbHQ+XTTNKEVMOGXVCdGjvAnoOlEBNKtpktjHyptLedHdW1Bi8DHE1kGGDe3o+Q==@linaro.org X-Google-Smtp-Source: AGHT+IHCeIPR5KCiNUnFh5h8gWfstN2AW9LfgdnVJZtoVcLP6t/3x+i7DZ12mg9fjoOaVl9pMahl X-Received: by 2002:a05:6214:e61:b0:6e1:6c94:b5c5 with SMTP id 6a1803df08f44-6f00de715e2mr16273896d6.4.1743724809959; Thu, 03 Apr 2025 17:00:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724809; cv=none; d=google.com; s=arc-20240605; b=I1p04xuFQUg+p08CJZDH00PgCsFolqon/JlYICKL2YOERp+QZArR6K8a4upZRr+L5k OFk+RGdREngh2rXS5pBIhYucEfCWu6PT++F0kh/zri2NbqFkjlrww2U/dO4i7WLuTpNf bAwMaAAup1hET/nHVZeUJhRrB3ChelP0Tme56bz4Kq98P0/s/ck/z20oODpmpU/mhLFW yOeVSl+VyLS87Kj6C48RBk7KrtsO8wLNhxzto4uUzGdGEoEdtDuNChD99ar4y7D/Xxu8 n2S9BQCiVDdUDNutUGWe603mfp5Zk5R3pkHFNTK6r3BKm0sI87OIX6kZ9ZlFEVEEREsi xyYQ== 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=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=TIT3TwD+rulab7ByQFT1uxzuRccHFCo115UsC1nValdwOGJXQl5nEN8toNuhsSKB7s 3jOgS3wIvs+Mo6/tBU14kmLKCm5cI6YOwJsC5H87LyZLZ8gpOIs0bf5SKxFIqClOJKtv wO0I38BGzPgkso0f74aQzpFGOlua83Q8Mv128tcK9uST09wSYkrXBBaL9v6xMoJG20Wc N/N10kHoSqXfD691MEf2HDwM5RhGcMy/kdbZaRC69Tvhwn3r1Z6kmAUozActLRCqsAIW habtOGTZlVioVtlZpYEWviGi/6lJU6gPHex5xVazMv1qIKXrffwamtUNFSSx0jX1A2hj ou4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wtHBVSDB; 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-6ef0f14407bsi21772916d6.431.2025.04.03.17.00.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00:09 -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=wtHBVSDB; 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 1u0UT5-0005kA-Rw; Thu, 03 Apr 2025 19:59:32 -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 1u0UT3-0005am-6n for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:29 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UT1-0002Zk-8U for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:28 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39149bccb69so1289865f8f.2 for ; Thu, 03 Apr 2025 16:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724765; x=1744329565; 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=wtHBVSDB8Ig+oxRV2b2bCTyaHdzDVvFzQ4KTQpJse/U0Tb4uOG+vdoXvwqV/SnETkY rOLWoUvlVR+KMaDHtNtwOuBgYdcdz1lbnD1ClBAymOyTgcm32t9Dsp+H2JYgSCJ23WVX vOK1vNJV2hLKhf4i/qp21ewGOPwxtIn3o9JAxvzHSYGsLtdEt1Uo/mXwS3n6Hm5GW9Hy JNvzDk3kB7JvSGaQagjhQAg12pzVCDeT3nhbultAmfMiRdhPFBDEwzy/tIL7Fto0i918 b6T0bJsgf+VSyxR/m8weuHzkTo9isX2+VE6bt15iu/CMnxg8vul2u1gl20rSRnxOpryu VXnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724765; x=1744329565; 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=sD77EtNsvlgR/PGD3Lc9vnpLb6gTiOeTU53KqSHtD2zjMGSLhJblhIbhL74wZOJ2Yh LkVpbm2NlY/BML7BT8OyMMt8KFfIJ+aK6tct5zk2zmiKZtOB15ngcPZrmBeNXCIQFxE9 HDUL8NKkGouP365PohA54dZ3TEdcnkusbs7xTT+sq971xqiKJvUMkECHg9L/tivL0HSi 0epHDIHGCa//3SMN04Kp9RR4io1SIU/SWhHhUWyM7CIKA/K6Aw1iNF3YFt3EO/7QnW+s i0tKDdFkBfSh9qNCVuXswsVb4Urzh98XQxx1E+y47S7lioxwhK2mUE0lKRFdXyAfD5qM qtVQ== X-Gm-Message-State: AOJu0YzTRRQB3grvQiU/1Z/iSc2bDjj/tbUX1Hi01dFEANKykMe0I4eW t5f0oLdZaAossmr9YvSSn75C/P8TcatSuLoAAFGxc5GdnVfm72JpJS0ucosDZjctHutjnX/axEZ Q X-Gm-Gg: ASbGncvRP16LrU38WTNE00yrv+oozalk3u5TBrKf1/KeMj5Taqo8J4trUfpdEIVs1Z1 RaOtYynsbBXjddkGYAn8EpBEzVGDxHXwejIP8N//MqC/Fl2QZ9IgBufvAb0FLYQy/pXTuBHBmJk NmWZPJ/jG/ePP5LIqUVIv3ztm/hNdOO6KlgKnsF3zuDirgacQxppRetAr3BUCG1RGjmXQXDnVEh mPziMukTfO6FgKMc5zPvH/6Uyw6pFpzJeVBH7/SqeKaTkEB3MefQa4F492md9oWJbv4kB0ybDKZ 2FUA5Gig9pTw3lL/6E1kbnkBBkdJ7/+bqLk+fMWhtuzXP4DseM2CD+TlIaAeLx7eb+WqIC6MO34 H6g4s/okyQ4MyZFA1sAI= X-Received: by 2002:a5d:648d:0:b0:39c:13fa:3eb with SMTP id ffacd0b85a97d-39cba9369bbmr904227f8f.39.1743724764991; Thu, 03 Apr 2025 16:59:24 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1660bcesm34148735e9.10.2025.04.03.16.59.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 09/39] target/arm/cpregs: Include missing 'target/arm/cpu.h' header Date: Fri, 4 Apr 2025 01:57:51 +0200 Message-ID: <20250403235821.9909-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 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 Thu Apr 3 23:57:52 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: 878011 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529703wrs; Thu, 3 Apr 2025 16:59:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUzGu1w+H9KAWUYH/dUjXZyuYSuDw+42VF+0q6O7mUSkPS3iGrEQs4C6xbPLc3jNPzds41l6w==@linaro.org X-Google-Smtp-Source: AGHT+IHi77r0wVVixvxowcrjQCRHFrD4aEvE5K7PcVrcG7rHBOOjWPZbCVtKT6J6kD57SvC1cHzy X-Received: by 2002:a05:6214:1d2d:b0:6e8:ef80:bcbc with SMTP id 6a1803df08f44-6f00debc511mr22075876d6.5.1743724786632; Thu, 03 Apr 2025 16:59:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724786; cv=none; d=google.com; s=arc-20240605; b=F2tOhT5XPRu4+xSTGcxxaslfiUGclqqYY4654sqTu2TVjjmdGV/yt6uJrI+AGdCn9W VIwU6GUxtyVfgididY6e1B67IvpcLeO8drJ6vmWWNNRYogAn+oBl1Q2y/RK1vCC9wQVC oPnPTkYkitoQ4t+7Iz46T21dXtwcMxURavXZ6QgqeLS2H6Ji7DUzsKCtaS3WqGP/P943 tLvNmzLBYlDtWZxebR75IcDzHOS36bcP/N4HPStybKpz5u2dXEr01QHGbJhmi7N0Ny1j HocoW6WK8M5yg4biqy85/2nmbIv0C7Yx9x3+MO59anH9unwop31jZUj2le4cLeZ3QSY5 55jg== 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=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=a3V1ehhMpQy08D4s4urAY6hkxPN0ohZQscK5slxEWB4Sy6aLS82qUpGY+eCIUJP6Eg RzrOVUCRDnzkSCcKSxzZ2u9Ocr8jeXYPEGMtgx9gxJrqJQY16Wmh5H/KWXp3p5Xnppan vNwiK3N9s8f84QbN1EbKjjusI97K9URKA9I1wvK7hJw3NqgJFMok92xVJGIBC+0uL511 GdTqC8+QDdWQ0pMgpKbw2VU3g+gQsg4Qiz166YiAFKiiXbGNJ/5DEaflRqHeMT2ymtXU sTe5lB8HMZjUf5qDwsU3H2ctIlgSo5GMaUOLh3sQKW8cAes24pcTf7oEPEp2fjmhjWjU bbiA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fjjV1REm; 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-6ef0f14cea1si21648736d6.470.2025.04.03.16.59.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59: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=fjjV1REm; 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 1u0UTB-0006QR-5n; Thu, 03 Apr 2025 19:59:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UT9-0006C8-Ba for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:35 -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 1u0UT7-0002bK-K2 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:35 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4394036c0efso10283495e9.2 for ; Thu, 03 Apr 2025 16:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724772; x=1744329572; 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=fjjV1REmAkE1mGQxGCUgyfu0FsZxFQAFLHr0ZGzywRmqGkSXvlVSzti66bmb3PYhDc qJCo628v+nZ6fKd8sWYsFY1WyKNVjL12LlM53in37wq5iHKORbDNqcC14yP4l9G0ESbb MKFsEDO5w51kdswwIssqjSm8R8hpmSW19qNuQTxPFdnYNvUx1wRAl28Ho1crAgU+QpyU z0++uV9NViPYPZH6NYYTd71p2FRdLJRayvLB/14px8/5TREbUC11PA7VmCFlhcVYthu1 G0Dzoen2gPd3iTWnTqjjydWINvkMaKa3MWq8NtJLFtszCW3UaEZHztdXhoGokU2oB5DR 4DRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724772; x=1744329572; 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=If2SELc7F//YYaqdkfGxoptAKZSsSqe+yyLWmlkckj768cvh5saHetPkoy6AU4HJXw GKeIYVTMBgSRrH95hiEM5FGyBuBOsA1rOFIir86D1cfIh/55zWJRO8eq2Swu00k8Go/C Lx2m2totYf2U2zaCM7GC59lg7oZkbRa1dnOxpxK5oOT/tZ6FoMI1wNa1cUQq/GUW8udK Iu/wz+AEYla+wGVnETtjNLYqITfAX7FFyM3PnJLPRKmv6Q4lqnzHN6l3aTe+l7EJtnCz ofEY6plBSy9o026OXycXCuBcGFF5ZlnhTC6UHG9CcIscO7hSMFQSoxhvdSPEroc+JrBn /EQA== X-Gm-Message-State: AOJu0Yw/4XaQe0iY2iJP+myv3DMWInc12HE1+j6SA+dMDyaIS6TK1+OC hdE1C7SfnDVeNaHy1BrzlYUoTpWpRtTGkhP43OoFw25zGFceh7GuCgO8A+6Hmqct3KUR88msTcP K X-Gm-Gg: ASbGncvuFLw5IOLfskQFYqw2As0m2JQGWgsVDmNzokGmY1wsg1y3dXnKxeSO0131vFv +YSVuc5Fs1E1s+V2fXA2J5h+ncbr8VMRMPj5Nq/933gUZjaivHoQs/uTNybE/LhMkZhPe9w22on 3jM/OGMB7e8C/HANHuU+Sc9WIFycBaI/7UcTsy45dpzTeSwtESPpaqapt+fEToY9JNACIrFxKQO cV0KgmIq9HfD+NXhffCnJuMHEto+vghD0fwQaxs+9H70Ci6vez+DV0Tz1jGaWiWNF5wQgzal8MR G9VCnPHKKchc4FfRC3/LoiDcp55kFCuceOSKw2FT1vDR+oR7q4c6Kk6LqNF4kLmXhHTMGI75ga4 p2j+U/vKCaGEDXfSg7oc= X-Received: by 2002:a05:600c:3548:b0:43d:77c5:9c1a with SMTP id 5b1f17b1804b1-43ed0b5e285mr4975835e9.4.1743724771664; Thu, 03 Apr 2025 16:59:31 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec34bf258sm30610115e9.23.2025.04.03.16.59.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 10/39] hw/arm/boot: Include missing 'system/memory.h' header Date: Fri, 4 Apr 2025 01:57:52 +0200 Message-ID: <20250403235821.9909-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 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 Thu Apr 3 23:57:53 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: 878014 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529744wrs; Thu, 3 Apr 2025 16:59:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVSl9lmvwx/yWCHGWMYNDURX4dSRblPVzc63JlxdreTVsz3Jh9MsY8bzJm6xn/H30VDo3+WKg==@linaro.org X-Google-Smtp-Source: AGHT+IHtTMIJ0Ekarbf2UD5z6tWDFQy3k9fmL0XoPp+Ru6l/XRPZz1hctdJiWxcb12h78hSqAeEK X-Received: by 2002:a05:620a:1a25:b0:7c5:9a12:41b5 with SMTP id af79cd13be357-7c774df9742mr162141985a.51.1743724791696; Thu, 03 Apr 2025 16:59:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724791; cv=none; d=google.com; s=arc-20240605; b=DuL3BXdkRYJ7uxc+hCLbdneS33WPrnLQD3k7l1EsyAkeAN91EJW0lbuDf7SWvB4w8E /EOuG3utTOUKgn1jR/7Y373aRJTxkElyUqvT6CeyG6w53oB4oHn60EKdKRUXjzuM6A/J 1hsG+iGVfjK2r6qIl4srf9GOZx+ieS8GOgRralDqsjsPjaYoLIKnR8Cf/axr/SQzJ7US yvAy3Azi0Pp96BAeoodHp9z9DhFPsE8sbK7Ptzg4eQ6I7C7CCGmbBxcvaRLd6imWncM0 SjD9IbfBY1p0/IC6QgsRgL1ayJZxzlDDewlRRb7XPG9kcsxSUGIn5N/fy14Xq5oIX/Ug N7bg== 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=WA+aRHvNoDByFG0pXYQNX38xTne48Zg59Pu/HsGsRuU=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=R1XpMMsuNz1nH/JItkGJUyrVv7m0Ur1uvaNAfOp+u4zncDXZOSi38ussGcKPS2NiY/ 3iZzaaa2QZSojKEqgTwPH8vp3RGA0Sn9JilJ0IShjO9SfVxDkfddga/TZSXmIY6qqPP/ AZaegI7yUGepOZWiblGWt17zAonRmWu4+pBYYCcsHf9Z6aaY3kZMQp4BEbDmqhttYOE2 mBLAP7MKAZENWXVBubSm/OSROPQPZr1HwztsHhFh5D5146vYiGRbI3uHcsndjn6x2SW2 O7wR4DKM0w92vXGhVymLK6VRqkfnsIXe1+YwC2AknZaUmXm8xADBnzBzhf5wARWCKAAm pvTg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fileE6QR; 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-7c76ea5a7edsi221499485a.276.2025.04.03.16.59.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59:51 -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=fileE6QR; 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 1u0UTJ-0007PA-SN; Thu, 03 Apr 2025 19:59:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UTH-0007AH-2l for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:43 -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 1u0UTF-0002cz-25 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:42 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso14782855e9.0 for ; Thu, 03 Apr 2025 16:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724779; x=1744329579; 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=WA+aRHvNoDByFG0pXYQNX38xTne48Zg59Pu/HsGsRuU=; b=fileE6QROhKFFSqZLylEa61UQLrze5n5FF/e8tvaEIv49nUQW2qSFQoQboQCKxB53/ 72KM18ai5fdoAmXef1W7Z5I17HAhh/aHoAWCncrb7Td4019vLzV2g3DPEmTy3Dge3YvK LX692Igo9CZidCKFy4uD2D+aV7HVqxfzLEXFC93MyzQwdo87gSpQnIYo+6TlihofrGP1 vAwQ492fXnkzeaFjQGfLNnUStcwnDWzH6rmWWhoivU48q2CW2N9bcGIOZjARsYhc5p4O ysyTX8qNvMXgrLUDazOy+ICuXubOuVoIfvqADaa5UKooQCmBwKLtW2jpF1oWeNaYdpM8 oiBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724779; x=1744329579; 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=WA+aRHvNoDByFG0pXYQNX38xTne48Zg59Pu/HsGsRuU=; b=AHe6OolxbT3F/umVnTDxy99IoAjAFh4XQmAma/vIig/w2jrk/g1nIXrUEzDFbXFiHt yc7sN9SycgzIVk226tGyrNV7fVz1TCgG9kIIjIEhjCBEczMSO+2WHVtp1sKm/KrkAAFu Y2NH//yJjfyXAOP4QfRXgGG0PsXVFS/gjPqUcKAL13NIr7XC+bWK6+OUmGZxfh8O7yM+ qqkKfOFED7ML538mImbyI7cj5Mp93VSwJgv6acYBwS8XB7tuo+j4jt7Mu4Gp3azmOLQW xE6/MaqCUmCL1WrgovPR/xcV2QMgabYOLY3mn4VTYf1EQxp1cKZbN82f5aXI/ozYOhSU 4rVQ== X-Gm-Message-State: AOJu0Yz2bTzLk2sS5dPkiscf2/nfh1ILvXBgVX/2806HjNIgR+3Bcl3o XLGivTguVINuq5UFv2rmJ9t0n6DKdzoQNYXO9VSqbWba/ZI22NNOG+HDv/g/mp+XknSNovfUMN8 I X-Gm-Gg: ASbGncumb/BgZF+7u59OAI0974XL8BtfFO9hLx1/Z7mJ7GjVpH5kDzXWQNvJdu593W6 rYU4/do9ujMFPR/ihsRMvFJe/jjLjZKgRbR4/LqEauTE9Xp8JNXk82AfipHGIq0Owgx8yYRMsWd HfVu78mXGejU0RQ1e/c7Gys9JcpKFRw6LUHPGEePo10jdmziYYfcdIzWEJm1F2dv++iuz0gMHdD N8W65lolezOw5tpK08om3ARMhCA7436yGLJqmoWGfgpJr1rxN4Yf+ZCCHUPFoQHXCJKxejTyTU1 dqQMSPRkBE/KQ2LduGhLKmGUXr2OJeoWFZl/4GUHcgqgk0ppTcq5UDo3DDbgG63OlxxWcsG5CWK 9AUD5wFJ9ipV1nofHQ+A= X-Received: by 2002:a5d:6d8b:0:b0:390:eb50:37c3 with SMTP id ffacd0b85a97d-39d0de25f88mr474677f8f.27.1743724778843; Thu, 03 Apr 2025 16:59:38 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c30226ea8sm2937655f8f.81.2025.04.03.16.59.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 11/39] hw/arm: Use full "target/arm/cpu.h" path to include target's "cpu.h" Date: Fri, 4 Apr 2025 01:57:53 +0200 Message-ID: <20250403235821.9909-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 We would like to get rid of '-I target/$ARCH/' in the CPPFLAGS. Use the full path to "cpu.h": "target/arm/cpu.h". Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/hw/arm/digic.h | 2 +- include/hw/arm/fsl-imx6.h | 2 +- include/hw/arm/fsl-imx6ul.h | 2 +- include/hw/arm/fsl-imx7.h | 2 +- include/hw/arm/fsl-imx8mp.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/hw/arm/digic.h b/include/hw/arm/digic.h index 8f2735c284f..646802806e0 100644 --- a/include/hw/arm/digic.h +++ b/include/hw/arm/digic.h @@ -18,7 +18,7 @@ #ifndef HW_ARM_DIGIC_H #define HW_ARM_DIGIC_H -#include "cpu.h" +#include "target/arm/cpu.h" #include "hw/timer/digic-timer.h" #include "hw/char/digic-uart.h" #include "qom/object.h" diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h index 124bbd478fd..0ac145cf6ba 100644 --- a/include/hw/arm/fsl-imx6.h +++ b/include/hw/arm/fsl-imx6.h @@ -35,7 +35,7 @@ #include "hw/pci-host/designware.h" #include "hw/or-irq.h" #include "system/memory.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "qom/object.h" #define TYPE_FSL_IMX6 "fsl-imx6" diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index 4e3209b25b2..f8f9c249a23 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -34,7 +34,7 @@ #include "hw/usb/chipidea.h" #include "hw/usb/imx-usb-phy.h" #include "system/memory.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "qom/object.h" #include "qemu/units.h" diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index aa7818c4999..6aedd2b80b5 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -37,7 +37,7 @@ #include "hw/pci-host/designware.h" #include "hw/usb/chipidea.h" #include "hw/or-irq.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "qom/object.h" #include "qemu/units.h" diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h index bc97fc416eb..f20f9e53187 100644 --- a/include/hw/arm/fsl-imx8mp.h +++ b/include/hw/arm/fsl-imx8mp.h @@ -9,7 +9,7 @@ #ifndef FSL_IMX8MP_H #define FSL_IMX8MP_H -#include "cpu.h" +#include "target/arm/cpu.h" #include "hw/char/imx_serial.h" #include "hw/gpio/imx_gpio.h" #include "hw/i2c/imx_i2c.h" From patchwork Thu Apr 3 23:57:54 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: 878020 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529767wrs; Thu, 3 Apr 2025 16:59:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUlG6WPHWKFpyLx+DO5tVEjFiJI3TnAr1yLWumd1yDOgZnQMk0wynvg6oxm8CQsUi8wdvdmlQ==@linaro.org X-Google-Smtp-Source: AGHT+IFK23hoUbbkhSkkkC8KxSanffh2uRoxlGNnJ2zeOKzUG524ouiyes5LghJuQcnyFb6Q0yqK X-Received: by 2002:ac8:5a45:0:b0:476:b783:c94d with SMTP id d75a77b69052e-479249eeec4mr19583961cf.35.1743724796755; Thu, 03 Apr 2025 16:59:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724796; cv=none; d=google.com; s=arc-20240605; b=OZrb1HlQPQjgad2s2usx9bEOysRgvpcjsKkamZhm5m9rRx13qlQncWIkVdTiaWpbuk VrfppQQwkQ/uxb1egCIbgDFTlD6bly2Z8wD9VKFWiPFHjYAp3AcUbx/2bhNxPkHAKjBB PoIPRSE5PvWSJlZOrpnoj92CpNO6ERo1iGBh50f3+s1R5iy2HasYwb/KPx67ZlhQ39NQ WduoYzyz7OkkKINLd+YblEQR55boh3clhQcPxu34MDIBa7uBskvpEpMYLFP+QhGxYmAh uATaNKqZePRUTwH8zDV0J6RSFqYvnCKevX1FfPrjlgb4q4GGISvpLGiAU4LAOCbt8hSp gvMw== 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=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=hBHs2/+aiRzL7+ruQYo5Kw8uz0ovRik9gPeYdEIZPcC46ehTdrCPBkqurOif8kqH4I mW5XAWmVuMuEp6NOl0jNDIP945qwzXa4QH68Q3epFI68RIzY+gmKZioS/OcU4CczQqHC VYZU1TYlFvnvVQm4g8C5C8eqn/QFajSzsyPw0bYigv/Ya7A4JweXZ7b91GFLauWn422X a7pS6s9GcH4Cf1vyVLr1q/dnKPajPBwV13qM3nSOxJVr53ssms1MtImXxmYwgD2KIrG9 rRh5I0QvblwEDrLdvQY9pNHUFS41fR7E4Fe9g9NgGiAECssxzeQRAKIBz8X3CIMz8SjF BRcg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LnNJxmKB; 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-4791b173bcasi20833931cf.240.2025.04.03.16.59.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 16:59:56 -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=LnNJxmKB; 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 1u0UTP-0007xh-JN; Thu, 03 Apr 2025 19:59:51 -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 1u0UTN-0007pP-OT for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:49 -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 1u0UTM-0002ed-25 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:49 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso10268965e9.1 for ; Thu, 03 Apr 2025 16:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724786; x=1744329586; 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=LnNJxmKBz1sIPqvMLUr/IUJ18ZwtsL0/2qDBGJB+K263D/u1UWda6/8xkpO/1mIL1Z +Cwc+5q7CAfntt8N0ffhgUbEcysMFTi/fJIODTnoVPq2iwA0MVYxeqVhAoUcIN+Fqur0 egjh4NhLMW65tHjenlmzod5K7YCPNKlA8r6K5kuFTpqUug3tKin/Cds79xhpVs/N0Cio /Pk0e3+gM4GPzDQ473MgtwhO4One9FH5E117npHuD+5jVYHt1y6PlZ/H8VTOZAVMPq0Q mmv+yEBdegDwsM3nYvrdENBhVW6J8Ldd1JEJapsxkfkiCiJzdm02kkjoqwQyFP4jOZwH esxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724786; x=1744329586; 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=Cb+dSqEDIJlrPum5lfOkmw1vjKIs6RfcW3mCfJaGAs45Mq/m7TSYfa/AQWKwkoz3rT 6G4fPds+oK0eBhBD3fsaPUKxVps4CTm/vXG6nSgL79oQOgC3ywS1lrdueb34MtWQtLFY rMWlDcxWUAasthSg7lI0ciZyj7TY66yXH7iydbVCuCPx4RngOx/5fwYx9IBvBELJO4Nz WkIFVQVkMrOw5DuJdVro9gd8HCtTnXIkbXklOd4AbElkrhNfHkYzKpVcZj3OG4tu3v8w aLc7oYm0iLG7ssEJvnMxMBxkfqF7DSjMmY+rowRRL7ii8j+fJgNBb4GcDv62mf/jBtsO 6Gvw== X-Gm-Message-State: AOJu0Yyg4Sdcr81fkgAgplcD++gJsp2iZvyrKxej1kkKbcIjlWIwODil H0+7wGCe8B4NqJ6lelSH1CtT5lBbZCWtK2bVGsX+Me4zYO8QwNKKxXj8HURy0YkjzoUgdwYcBSl 5 X-Gm-Gg: ASbGncsfuzetGJWHhz7A6kdz0XxYd7AftUPZrnlAXB9PbtkgJgb8na7Sk0CjKFVsQYL PwXsWOkSUmnmV3bJNvuA6puaJKUH+9DJUBSTSYNJXMEv2AsoHip9Bz3R3mUkqzYq7biIzvkiXqp DCobsWxtqtZT3QKLy8sYKbSLgVwyeoxufErgg5hIXQ0eFxBY+0iLYB4LI0QzN3dh4wBLtPRsukL 2Oo4EF/nhTFzZwovyFmh5B3zaXwWIqtweDJaHaxmjD5PUPY79fbibm1XMXaCCUcQ7AuZyH1wYB3 ZUffMhclsnRB3PcLketz89diHJ+MdkDH8Z6TfTkSjbR2gU+umwdsqV1mc1i54lPUy8YjaI/3x2k /Lke/j7g1di84cqu5dhQ= X-Received: by 2002:a5d:5f81:0:b0:38f:4d40:358 with SMTP id ffacd0b85a97d-39cb3575d11mr859095f8f.9.1743724786023; Thu, 03 Apr 2025 16:59:46 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec147c9dbsm35465045e9.0.2025.04.03.16.59.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 12/39] target/arm/cpu-features: Include missing 'cpu.h' header Date: Fri, 4 Apr 2025 01:57:54 +0200 Message-ID: <20250403235821.9909-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 "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 Thu Apr 3 23:57:55 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: 878063 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530236wrs; Thu, 3 Apr 2025 17:00:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWVaKZeFXkPEsJlztM8snhU70HYof5S10okoputViCDtCPVEw6FDZ4VIiDHK0L+J9ur0zQfRA==@linaro.org X-Google-Smtp-Source: AGHT+IE5vmTxlXDMei1ys2DRDDJejggjS/FGwDyMaKTh+1GQ9jqMviFNru7dKYap+IW/e4roBuvJ X-Received: by 2002:a05:620a:2845:b0:7c5:4a51:238 with SMTP id af79cd13be357-7c774c0c91emr170158485a.0.1743724850481; Thu, 03 Apr 2025 17:00:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724850; cv=none; d=google.com; s=arc-20240605; b=FqRMIFJXbBVpwBXR64v96pb4ZR2CbnfAshWq+UqPBNvc7mMCvTwzIqAOYWrhmL7O+f f/wNqIg+JCgbyLxMrsFXkK3Tiit799MbAGV9CEJaWZN6NScwRLQuZXmUlFl8FywTMIDL v2rALRIgt/LQqaTjfELxGOeVW3DRCl+wKVVBUfGoQf8sU1qQmdqPTkbIjVJb67OIAXRE xM8wUJqXoMGl5YEA5/irTxfXooVvB7XIWG8uG8f8B+e8s4PGhiZE+4KKYLTq995m1Mo5 zRlOPnU5d0E9vzrOtm15nh5m6SWLgcVsSlHwiHgVkcw0ubBlAJuj/EjjQUVwC2xLK87y 2hxw== 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=9OFBiX6dxLbD9pkYgq+eZM6SlUvkzvFJZarT+zK7Jjw=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=TW4WxqUJdwyM90+2brTU3+JXWwKza1Czch3VR8uMcWqXl3c7AnzlpsakKQIr3mdFxR mMFfU77d5xpzgdC5Em1G3T30Oog/DcRFvt4zi26d6oq/qtTIW+rHqrdEAWT9A/qtmAGR m9BKJ0bdej6pe62QsrYFne4Rzismyb2VeNdZ/P7LtYvEMLxLTUVzKkHS31p6t5ofFBrZ 4636hIUtUkL3PSl69s4PgngNvUHGqIf4mMDAPFJUYYNmlSzDHF7cTZ1JszaAfdW3dXO3 506IP2IY0ovgNhilaCejfi61PfYKhPJmCdyBsfNWYZFPMKF+k8qukSa6PGAlBuUBxser 99OQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KKGPZbVR; 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-7c76ea97063si221028085a.447.2025.04.03.17.00.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00:50 -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=KKGPZbVR; 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 1u0UTX-0000I1-2R; Thu, 03 Apr 2025 19:59: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 1u0UTT-0008Id-MJ for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:55 -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 1u0UTR-0002g9-Td for qemu-devel@nongnu.org; Thu, 03 Apr 2025 19:59:55 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso14783705e9.0 for ; Thu, 03 Apr 2025 16:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724792; x=1744329592; 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=9OFBiX6dxLbD9pkYgq+eZM6SlUvkzvFJZarT+zK7Jjw=; b=KKGPZbVR4BeJea+Tv/0PwDtOiwgF1zk76ZL809g8q9VdCh7pu3LKAM5vij/NOE7FtF rnV0aiZRJTne72ZPl0ccSGJAJUKr33+spRCyPSRNds7qtXvvj519rGMjn5xWrVLezvaS bsV9X9/5qesJKelW16plezbYeHYYPy17lMhFl52qVkEXLsrpW4yPYZyvgcDuo3xh9QI9 LnLce8iBgAe8gfpgVgoN4PcY+iyEMO/5nelhW0OKGJupoehtLEDmSc0i+D0GKXIno7Ep QinyDn7EZZQggw9VLwuZreP7SDxByqWKLo6oneg7vDdl2aMZ353iFByMpSe9Ftjcb/lY HlWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724792; x=1744329592; 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=9OFBiX6dxLbD9pkYgq+eZM6SlUvkzvFJZarT+zK7Jjw=; b=bkXTq1kDwUhU+5/Mv/VLMhvea5lLV3bDU8mIrQH+HeHl7v3uob/P8BdTdXV7KLClxU QAUG5uTPbf0arcVofT/TIXhtmQr7yRsPCbP4MeOsaXTiM8hWgB9miv6IduHwskC+wDo5 gg0sDveFRnDIk5eqIGrP8YBX3Rdn7ye0QdblG+iXpOGZhAuwPyo6aq6vUQaC7AfHIUvM Y3WRY+cdGyvwCR0G/SBiMoayolMJwGLkq6BInNIVA9W/Jc02XTLYvSIPFwm6j6/Ba8cK 1BZsykzbLEC5SMCek4VzhjKWce1QmEx4ArD6oy0zbZLM/pkHdTMNPZyZTiFid2ldcM2E K1Kg== X-Gm-Message-State: AOJu0Yw2yGVAXn0zl+DGwbnRgO24ujbs/3g7FFAMwTUmqdeNfgoghm+d KCnK00HtXaEo8C83LEby+poZI7s4pqI5CyHzEq84IqM1GTKE+djhMOjic2Bo/QKKS7QrF8m4QmL y X-Gm-Gg: ASbGncuGf/XMrKqVwNWPuQ7mjt1dIJEUjsPQxmtR4JnQxs4opvaSQJ2pj0DlaMDcIzX pz9bAag0/I+PF0+GoSFSFbW2VtJfNCLS1S4BvH4Qetg07sNFsgrbqWHen3hqc5XjPHXAgKzyAeR N6X1k/XvHCOXnvoxc9cjmA+53pQM9gXFPxQ1NwmJYg9vAkmH5yclBYA5ucGy4CS4uFBeOxIA8k2 JEsXVdxh10FoTCXqrMlWT+d8RxSfA+B8friVoGSxfhFky6q5irA2AiavL7YMktTE2RyuAHb3sgL cpYx9I2wnPECyHNPBpDXCw1Xplst0c2TL3ZQRFpc9gR9LXn0RdxKivuFTE1Eq6ixrnwF0klUnOS 6ioU+hTSaNmMOSKsQG6BPBJ6rKSlhMQ== X-Received: by 2002:a05:6000:248a:b0:399:6d26:7752 with SMTP id ffacd0b85a97d-39d0de66ef0mr433854f8f.38.1743724791871; Thu, 03 Apr 2025 16:59:51 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020d6b1sm3023476f8f.62.2025.04.03.16.59.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 13/39] target/arm/qmp: Include missing 'cpu.h' header Date: Fri, 4 Apr 2025 01:57:55 +0200 Message-ID: <20250403235821.9909-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 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 883c0a0e8cc..d654be2a619 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 Thu Apr 3 23:57:56 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: 878059 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529960wrs; Thu, 3 Apr 2025 17:00:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVnVWgrYI4CPj2U6Rm58beFAET7fyyia+driQhBeuD2AksZqE6C9hBeb44Nea9eP5RBZGdnkg==@linaro.org X-Google-Smtp-Source: AGHT+IFqiMdAiu+w9ZHAzbmoagZAq4a5vjkP3GgY3w4CANEL+0hUz8QCCyCVFVUJUrbzFPgo3A+D X-Received: by 2002:a05:6214:242e:b0:6e8:9bcd:bba6 with SMTP id 6a1803df08f44-6f00de6a618mr23197946d6.7.1743724824119; Thu, 03 Apr 2025 17:00:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724824; cv=none; d=google.com; s=arc-20240605; b=ck3dfhFFwd8hrFXOPzMP8YEA4yPnrJfL1MsL6j9USTDe9+KcHTyP+kg4Fhf+MhqOGI J5jZl8XtwTbZPceYDYxh1e0YtyHQHnLjEF19djxYiJ+ENI494MT0Pq6QFIxInKTIRQmv x9NXAF2D+zE5J8voVxoXqZzhUljeIPJLE+txjYbyRWhMs9VAYHKTAFYKFurfuRbU4xD/ HOyMIk2r1AfB0S1mKsphS/xyk507rLITs+jH5k6DcBqYZJTBKBzaFDHwAmKypfnB82AH Tszhx00qZNKdn7SWpB4+n1olWQSKLeoY4VO4B6y0xHYWpy6LQeM+xMUBt3JFlBltPxNy OxVQ== 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=DvcrIr+xAa590f6wvTNM2MpnPt6CecU0UbII1dwjeK4=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=XHysO3jgjhVZuJ3H4wW/8MT3mg8sSEloER0He4NBJU5uO610ZpVxHRiQ65nLOWUGm2 ZbufWS8jaCU9vlY0TPtzH6nK/7kfUQiT3i+/9PVrVPPphEeuKcygF/rMhFz1V7udd6sW szJD5XmmKsLMExF9+0DhGqfQrguJZndM2kMriW1tjbXIAWaCVX+QB3LePolNLmrdr7+P KrVmsEOnUKzg6L0ueu07WONC1C8vGNNZQsXJ6WjV+ydGysUtov6cCnslVa93Eox2CfoR JYq5qgj2YRjTUlkdDrB0IR1wVoIhIdhmsqS/hFAU6ZuhTjZ762sXiWRnW3fF90G+AIia Oojw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MBfBwDx7; 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-7c76eac32fasi205156885a.580.2025.04.03.17.00.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00:24 -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=MBfBwDx7; 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 1u0UTd-0000wF-M7; Thu, 03 Apr 2025 20:00: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 1u0UTZ-0000en-L5 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:01 -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 1u0UTX-0002hl-Lj for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:01 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-39c0dfad22aso906378f8f.2 for ; Thu, 03 Apr 2025 16:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724798; x=1744329598; 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=DvcrIr+xAa590f6wvTNM2MpnPt6CecU0UbII1dwjeK4=; b=MBfBwDx74Wco+zvEN0+Be9HbSughSishE4wvtvmJMEwgQ6NSJ0jOCvf6zTvdfd+/ZI tBlYnBclF3DrSLoLSCPal9AHsLKFSAEiUJy0antihkY7E2SUpY+o5f33tbrEYO1KCr0J OIsXxPQuf+wPerz1e/hv+iqk3iGcA3NyXCSrl031nvLqWFfPeeJWfdNJgXjE7+PrWdi7 2gEc7VHBA9lo5Xv4AgRr36rXaYWfVGST/6d9Vj81zBRu+uWB6hy+EabTVS+Wxy74hmyq ZIGD7Fh75K2yCkcOf7iZoIfZiHJEJzpqBpxhGA51QjEdNhFT1vcMZidpxGVAvf7LbueI /cqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724798; x=1744329598; 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=DvcrIr+xAa590f6wvTNM2MpnPt6CecU0UbII1dwjeK4=; b=Odjq1/sSrJNahALom2qn/QLkhOtr1y2FWpgaD4vbN4mSQlf1qJpRMt2iLQd6gPVMyb uZxfD7FLSDnATlN/5CwvR28v/JNgSNLEZtTSBPM4mfOBmaaT7REL77tX5n4dN2aqiG3V MIFKJWUpwk9ewtiM4WyNrZTNh7JoMTbKnoMsDKVCkT4gYkDxOlMkaiHlrsPPqiZ7ZpgU jjgZUaPZiQi0qn+UhmFh9qV/ATtJjIZrwz4W6qx/XNUYvmab7WlUYKIhjClFhMd0gCD9 T4fMkdOakCyXF0djz04zebnoKxQtNd6ozVY9WGnGPN5zE3SEizgK8tTZJq6j1EuiZx5r bF+w== X-Gm-Message-State: AOJu0YxzqFO+jAAidHrxQ1t3143mOKhh3p89EMN2McFLywUQD3bWMfv4 vCjeFzkzQY+Dgqjg0Plo/HgdtbWNHJT+/ZqJ0N9/DgxSxKEz8uNRARinAuw63GRpcoIPpq4IZMB u X-Gm-Gg: ASbGncuUJllXVjpiltZclL8qSDZ2i5DFE/glpJXhwyYgQiLq6RCGuLmMaecPZnkbZdm kw3pn0Cx5hhOjUFzF5nAfhyiaDUgdKT2QIdnzzNXAIcoVpWaE/tdqMjxYC+k+pyWDyRWtP3a2JQ JBbS6Y0OAHbWeixW7BC633jHubbN9EvSZaHgKxH3Tu+ifudRKpBkcW+z2v7+wK+eZFV3904TKoR RVdrs4eFk88h0zQIA1ZJsRB4K7QC1egOV2861AR6JXDCTtTGts5p8Urxqh55hQ1C3Nfiw1yn666 scSIXbjP63mOgObfnaFZDoj8FHHuFSZ3z1YIby8/jf7c+OYCi5KhzUS2oxlttm6ba5BaYSUh8mf bQKtJ8cPChRJJy823g2A= X-Received: by 2002:a05:6000:186e:b0:39a:c9cb:819f with SMTP id ffacd0b85a97d-39cba975b19mr788973f8f.37.1743724797739; Thu, 03 Apr 2025 16:59:57 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1630ddesm34261865e9.5.2025.04.03.16.59.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 16:59:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 14/39] target/arm/kvm: Include missing 'cpu-qom.h' header Date: Fri, 4 Apr 2025 01:57:56 +0200 Message-ID: <20250403235821.9909-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 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 05c3de8cd46..2db2f060e6a 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 Thu Apr 3 23:57:57 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: 878057 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529932wrs; Thu, 3 Apr 2025 17:00:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVV8QrsWAQ2MS8I0nE5CWSNbyjEcvyRESUGs3qqon8hZDrhZWtiY358ElCKQ4mSVJ1cGEuipg==@linaro.org X-Google-Smtp-Source: AGHT+IFrvneWNudbm6odqLcFXLA3J1VvFC+QcH0WJdILpVdJUAd2W22AcQPFSf69tf7nFbdpIvdA X-Received: by 2002:a05:6214:2a4f:b0:6e8:f166:b19e with SMTP id 6a1803df08f44-6f00deed9a9mr19026046d6.17.1743724817191; Thu, 03 Apr 2025 17:00:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724817; cv=none; d=google.com; s=arc-20240605; b=kUbidGkY3xpnclf9Cx7li96brqwBVj27a5hntYaM16V3/FPh3ySLzPNPZt9A1QtsQM wSEQmC+G9k2hQqyzu46OazzE9PPMGis2DzWrWC+hPA3mfNH8kv99NE58feaKA8OGjA8w lLUkzJPCtV5TVuYtp2aOlnHMKZHW7fW6n1taqqpdxRj8XQAm92O2CuzzlzpBj5k+kpU1 ++R6SkyMtrxrqQp1NSgyPREBjuNMbLofn/Px2iWgbrSE1dQM24S7Fa9681XdgkbLZ2My XI1YazjiMFhbqfGWkEShUdF8mCD2WRxIfDOz9vEUNe4L15LxXE0nlmte35wOBWcej0t1 cUNA== 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=x/hYdhB/qBclFHB0dhTATnM1BEowxhG26HVaZBLKHNI=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=kPju/sB2wWVIjSnI4McVcmeWiAmaDGLmepevP8F6MTrjycuAH3VlkDANxBOMe1f+0y LxM8L1b3WCFCGEl9FQZPjk51fRo6pT/t6T/BBFyTVsI9ZhOTVvbUfQW7i+b0BY0cEZAF izfP+Lthyg8iOZkJoFMQ5DjKCxrrdjF2bV5maPThClLPj9/+rxBH7YbcCqD2Lo9Jr7VR MUzUs/WDVQWmEyhREQH9uIT0bV5rMj5SR53fJevVs3pB9o73MUPpI2/PhlXkrcA13fk+ huRSJ2U9G0VqraG/ACfC2lihT9r6jt5HAm8/cY55U/CJUPqescXmH8ygnJMKqx/0tleU 3smg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S2F0UDsb; 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-7c76eac21a9si214992485a.511.2025.04.03.17.00.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00: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=S2F0UDsb; 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 1u0UTk-0001Tk-Vt; Thu, 03 Apr 2025 20:00:13 -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 1u0UTh-0001Hl-NK for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:10 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UTf-0002ix-P6 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:09 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3914bc3e01aso937828f8f.2 for ; Thu, 03 Apr 2025 17:00:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724803; x=1744329603; 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=x/hYdhB/qBclFHB0dhTATnM1BEowxhG26HVaZBLKHNI=; b=S2F0UDsbralmicgewmsCM8p6IW7gvnOU0KBjLYC3zgonowdBDmEhoUvyLJkWzUJGDy 362KgGNWJE7zJOLo1JLhv3XCSQ6e9FkFkaWAn/w/lUS8aXUDjzU1URXVqezU/5moRSlV eWIfrdqSC54ptt/0uoAvvRMXCVra6XXkbS2vk0uPKAzpYHYIdsCixPFDq/DdvgkIPG29 nNFi6AD/Kw66KQyF3vQ3bj+noqCEv3p/ymyN1gUND9edrQtja00pOUr72E+yKo2Ct6FO 3fE5A0sjfBmVpN7m11d6pBq//tHKH0PD6OmzRZiuBIbP5YBZGOiDPM5ubchoe94lw7oR NVQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724803; x=1744329603; 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=x/hYdhB/qBclFHB0dhTATnM1BEowxhG26HVaZBLKHNI=; b=V3WmDBevcXVhi+wKcBBfvWVK5ITTTZMvCXTke8p2XYjf3SVpnXDhqhzXd+ulSRbeLW hlzIWOHj2/uGCW7+TeYCDNcLef2vn3VTdnCikvKYS4cPQHcZ+Ma5BVhE4L9fPzMXjw+/ plkqRkKt7An39eFA+MYCykP13wR1gtwAgmwmcsYmefWxJtNIz57McvuOk6lxaO/nMVI5 zTt0aP9e5Gf4LoulfZZBKr5XxKvtJ9Aw/H/JXudnflzBv7omQiN4NfZudJYG5OZrDh7y 5fzg9kVGwRNf0gqEOm7C6rF9/MDTXsvVTFKroLOQe0zaLdIEBUr7ue6JRvj2UV8cJwE9 ZkYQ== X-Gm-Message-State: AOJu0YzIJ7fvbvUQzeKPWBXc5YjTOD19bXPb5RyLdFmv3ls1DqYwlXjg BflgIP5AI+UkRofvkPY6fbLAlm/POHf2srci8GXtEl2sX+sqy0TKwAh/12CIUGN5XnLgI9kVZiq g X-Gm-Gg: ASbGncv3ks/sZHQiGB7CP8aKiqglzDWfmWmNoEC2IefxlgwIMFS4leA8kldnFVGMnJD fMC8sPXLw34D1zJXEKdP90+A449jhgCdRUQP0WDTjtuU9TDI+XsbVo3y1rtWZdLgb+AxxPfWjlZ pIGhUzbXo7tMdDF06bS+nMv0IkF8qoz9KCmQUmm3lzRlyQ8BJhlHS8GCyyasgMjPuGiKH1tNDhW sZoqnrhRlhT0QZ3hiwLGsfaDCvemsnfxdAVPfOVT7axnnW3Y7UKeQj1KkX+VrB9r94cRAP5/WxW Dtchvmc3g8KM3mmUqSbezMSTNv6yduR/7SNcx81lPFCFW7phG8+mn6YbHdwRXu5/Z/iM5Kj6bOq YEOB6CzvoN8dI1zyE5io= X-Received: by 2002:a05:6000:2d0c:b0:39c:1257:dbab with SMTP id ffacd0b85a97d-39d1476309fmr283778f8f.59.1743724803393; Thu, 03 Apr 2025 17:00:03 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c300968c4sm3012877f8f.9.2025.04.03.17.00.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 15/39] target/arm/hvf: Include missing 'cpu-qom.h' header Date: Fri, 4 Apr 2025 01:57:57 +0200 Message-ID: <20250403235821.9909-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 26c717b3826..ee5545f2d10 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 Thu Apr 3 23:57:58 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: 878060 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3529996wrs; Thu, 3 Apr 2025 17:00:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuVjjzEcUm8sE5Epelbb3lap+Csnx8ufjWYt95RQdk8cxbKUuTCs720mbdNJQ9Yj/G+VlPxw==@linaro.org X-Google-Smtp-Source: AGHT+IGwIIC1gk3jqZZlOUEwCKXBZp27W09AKLBbHXPqx8gMlRzD08oFIAAyJ2QN72yYRtR61XoO X-Received: by 2002:a05:6214:2425:b0:6e6:68e3:8d84 with SMTP id 6a1803df08f44-6f05845ead0mr19300046d6.18.1743724826560; Thu, 03 Apr 2025 17:00:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724826; cv=none; d=google.com; s=arc-20240605; b=CiQHQivgOEQ/HwKBqIo2V6b3gX4l+2mOvhOncdC4wJvaNcctde0b2Dhr3BfqYR5XOx K+F9wjwhrP9+34/ZXwqz9aqZJbPnUGjBWJfNeKQ57NVkPxnxbJL6bjqJi/Izv4a0Q4IN vqDCG9/BFLfv+40wiPnLNNsOcQ2OFtSSCx6gvp0IkHTA6IgKuC62Oo7SwKso2JHznnWg PRdrIj2fduyPSfBUEO/kbNHa2fL30c1W5dA6W8qCQ4GEPBJwrE9rs6YqxoHvQHlC1Iys HEsEdiYnw2/zFaQeqX497VIOEC6qTe6tfFUQZrkE79PHIf7gO3iZ6xRweiSITAtE96qD qoPA== 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=MU0NXB5YOpxPzbW3TbTpdtY5zarUPJhlnGyCYPlRhd4=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=dtPfWwvMN3jePxNFUy8qbux+b6B9us9G5jh38boYRCraJeCfGRtXbVrmh7kBqxzn1R JoV3GCX+Jc65uEHdbWMfUc2IDRhsW1oiIyyLxnJiN4b/ICcsOxBTe4ndVoDw5ltJMzVs x3+ejtM9VC9xW9OZYPGXeUoePwvKH0pMRxTCeKcOagR4AMBmW9KVGk/UDsrNIvpqzKxd xuNk1D794bCRxOrD5YHOnYxXvjKAYgZ//d0c0mHTVNh79Xisiq76ljSeXpc6tpaSxBZY tSfJk64On4xROh1Klt1HoqqIYDBG1r9nnc3Tcl8g+qHqlc3pfvodbIGY2D8dDzZGsUOf UG9A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CJGx2E4U; 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-6ef0f1473e6si21193626d6.447.2025.04.03.17.00.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00:26 -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=CJGx2E4U; 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 1u0UTq-0001qO-Hv; Thu, 03 Apr 2025 20:00: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 1u0UTm-0001bq-LA for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:14 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UTk-0002w1-AO for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:14 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso10269945e9.1 for ; Thu, 03 Apr 2025 17:00:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724810; x=1744329610; 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=MU0NXB5YOpxPzbW3TbTpdtY5zarUPJhlnGyCYPlRhd4=; b=CJGx2E4UAN7RsRXGOsCfYwYyg5jOxFZ7oOoZSo4HTeCyhGuGOTTZpfSAYBA9CMbWAh /gub1S6YXzHxo0QNbf2c4crtYdBXYQ4TYM+h9y3/Zn6W+bd7tnWLiQcm2+snZY08GFsO M4JAg7iSKUJIxEJoQvBzxvWQQ9TpNhcKXqbaRYWsCh72G6BLy1e9A9fpKQMT0oOUboEP +3tqAXdyST8271bVB+rwDGx5BCILchxgYkjCYjPrzs/wSUaq98menauEdZr8xMB4xbpK MvxtUDXwW581MdIopYK20leQy4pdvhCTZ2Sx5toyFRZ4PWdMVDuljTm33jOtxNR1QTLO VAPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724810; x=1744329610; 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=MU0NXB5YOpxPzbW3TbTpdtY5zarUPJhlnGyCYPlRhd4=; b=Y1Y0cDs6wuobn7FNN80qzO5YvDaBlDUtff658b+mWycMtdSf2641upw6XqK8ubAH9M KZiRTHlUjr3tclfEoFDV3NAVU66wAvjiyiKz0bsWuu2mmqdNkszARSv657A3LT90FXpq wT8R3T72X29XdbLj2H5TB6pqKoXcY7V5afL3JXenMYO6KbhmedHqHFHjTw6eVBI4JJQC E4AoCaKPxVC5QN+WDVzrH3HBZ6x25G/9uXwZrYBrVmbUpNXbMITW2rQy4RBFfhIzCm+r rWrMiaPbpUPHiHjzY2bPHO2z3Fi4Cmavy+70vsHXEjMVktw2dX1kSXHDLjVNHsiQyUtn e9Yw== X-Gm-Message-State: AOJu0YwGS34ObmuPvPnXIKxS0N2XbOFz4D7IHRu1wfsuAeo1qzvxJoUr +R+ge7JYvW7wUJY1p48fS+H6Ik6JQZi6sZYVczMgJUQmmVzFyJADWM0u/iQC1jev4YIXziBqLVR T X-Gm-Gg: ASbGncvH5J8bki3Srpe1tFhq8E8pHv9DsEOwu5ryg0p7wlcU65IWKgF/Gt3d5lFkVcs O45cw6AsNmuQOg6f4q0AF6GViYMxoS9X8jfhVMm7rYMZnbQzAQALl6jqLyWWd+4rM0MN+nUkdQs sGk+cpnB8nBaWOBsNOeiEia7oW4gqNVSi771mEcqZ2YxnD0TpURy5XQtiErxDQ7MlgkKe3LsQ28 2YheBNM5uFlQX+EYl2kDNSWhlmFMIwUAKIibFiGSMK4EcJ8+X8qQUBB7HIjm3okyCCi7XxOGJXv yBmn4/wdCJChzMC+sago+tudFmInuhm8eWHboNGtCncBCdYZjAR5pAOnuZcPNdVfhMorfhxmitf 5OGUD4VNVSoS4WJOXc3A= X-Received: by 2002:a05:600c:4443:b0:43c:fabf:9146 with SMTP id 5b1f17b1804b1-43ecf8d04e2mr7608485e9.17.1743724810106; Thu, 03 Apr 2025 17:00:10 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec34ae0c5sm30942505e9.15.2025.04.03.17.00.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 16/39] hw/arm: Remove unnecessary 'cpu.h' header Date: Fri, 4 Apr 2025 01:57:58 +0200 Message-ID: <20250403235821.9909-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 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 b452470598b..04439364370 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 ea3621e4f87..0caa08631ad 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 e9abbf00b43..604f6845fde 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 4362ae6aa1c..df3f5a707a9 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 Thu Apr 3 23:57:59 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: 878064 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530235wrs; Thu, 3 Apr 2025 17:00:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMsFX3opEbTwWSge+Z/kGBI1p6d6CFTJL1kh6Ri61aaKvpWaK575OrTZmkCFE6oKBvz0Tdbw==@linaro.org X-Google-Smtp-Source: AGHT+IFBFjnCgRoCW18CenwJe0YAjWuB3CRDHoAMg5s/EU7yTNhsAgfvy1mEgNBM06ssaJLe9NYD X-Received: by 2002:a05:620a:1a06:b0:7c5:5339:48cf with SMTP id af79cd13be357-7c774d60c84mr169177485a.30.1743724850564; Thu, 03 Apr 2025 17:00:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724850; cv=none; d=google.com; s=arc-20240605; b=B/2y+xX2e4d2TYuNYCLCL0OAdEHVi3Nc75GO4AWU+CMwfx49zNdYP5yjfDO5UyXF1r t5XtS5NujFf3cckaLZRSBncKwSSMdrBBAqju403phLcHEU8Ye/u7bzg2pdfwQlO15YD5 5jRFnf2Qn6CrbQJjTF1w5wVvZEmCD/Uyhkc+UVs5SMQpP4EEbsAtjCjkiOEauL6Wags5 0tgsrfgY0rE47SnuRoPSjBdhbJfoU58t9ap4Crj9C2CpyeYSprwc/sJp4Hkg3rRIlS7L ux/JT+dj0CLW6g7swI54R1MkCJqkkkzjGexxd5zrZV+I3Ox8F5na1MyD3HR4Ojam7zCf IQbQ== 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=SwOev6P4Yow8Jn5q9PsEhT1CQP4v/3jic2jASXzU5CU=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=UxYDsmmEDOe9PX6fTYZoJl5GQWEYiJzClLJiOzjbPa8I53o6tjg26MoKvb2AgTsVNv 7TwyX1VFoYHNJFqHk1jvhMIQVkor1Wp66HKsEdLRJ1FWhpkV7CIpdgl97UjtARXmeHbi zRkquMYD1Zm235Mv5pO2Zel0QzMk4H/k+CLLQO8v/ADR5RM1XrIz4O8jntYk9Anfjp0d sKT64/0vivMarE0dFIXo28bdyjQVqsjxjmVHdyHmWnDV3PWjfiRs0UWEI2/DSkWwy1FS VZqgQ7MXAxWhZKpuNTnOKjaW4skBufbVCC6oFb18rHP9GiLE1z6XPz8wyibTw3ua6cCR EoLw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tyn9QVV5; 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-7c76eae479asi205021685a.633.2025.04.03.17.00.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00:50 -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=Tyn9QVV5; 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 1u0UTv-0002Li-61; Thu, 03 Apr 2025 20:00: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 1u0UTs-00027k-MO for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:20 -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 1u0UTq-0002xA-Fr for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:19 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43948021a45so13750165e9.1 for ; Thu, 03 Apr 2025 17:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724816; x=1744329616; 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=SwOev6P4Yow8Jn5q9PsEhT1CQP4v/3jic2jASXzU5CU=; b=Tyn9QVV5jN8XQCO9xVOy4obhcmN7eAsP0iO2zIjP41VtqUanQTTXVGaO7mjOM+0RxD aVKr0y9lcQ9qLpnIj020EK3sclpcqcguvdQrtBD49OOW9SeOeuGkkFwGha8u9I3bfD4j zpDdjFdEV8RobuUtOwn6RJl9oJPNHGSibnCCxRUZUHIT/u6XSDsZz3Fe4iO2UtkfMUOl j9AKVFVYiJ7cQYsAklyZ9La60VLCrEY++8C7h3DVB8VaT3stPaIFFxHV356ZwUltB6U3 MlniadNlDM23iviSnC0YkDhle7LrsM9rnzis1kHOVyarvrCCh6vzyuYtroGil4s1eQ7d tU3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724816; x=1744329616; 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=SwOev6P4Yow8Jn5q9PsEhT1CQP4v/3jic2jASXzU5CU=; b=Q5xkvL+jyiej7Dgg0xdfXX1jAE7PVOqHMyLtm3JpAFULth4gFohsQ2/E2z49vFCWSA ZzoEJgHySs0wf7YhA28sdTzeHO2E0WKquUl+1c1ND3gYlNHOFn2eggHRd7Y9+NgpPFMR rXLl8aX/WfEBOT5aSM1TFfEUnk4V+QZTohWPCe2npy3g3A777Sw8Da8zJh+IUtFfTbvz 6U/L23p7nHSN6k4Y2PweYJGwspAuCtd1Zq6KHa0ulxs2bEvCqV0cr15sgzAleHWYht5p xpxZWwE2mhegg/kBcjkuoCy42mBboTYKZsKMe44wkcGrZLJN8QxYREEET2pQ3Z0N83/W tT4Q== X-Gm-Message-State: AOJu0YzGRw4Ado9GKwk4LxD2sFkU7vOEwYLqgIpO7GvEfItCVLVVE62Z LFXA6e9onDUsYbR2jt5PDy+6L/65Add0hPhI9Z49F2zDQO4euh3RZDvc64Qe8ERlMqHO7ssNu5K g X-Gm-Gg: ASbGncvjfh5Y9ml82zavfYqHfDlf6RQLDwZ9n7rQr7wqhFgZQdp8nGOsOFBDynmvEA6 8Ut5ZWSGl4uAXh6KWBnWE3YwUG1P3A8C6kFHRzIcQtLzSROywLzP1kfGr8jZI9J12/F0hay+ybL N+GIJAKhjM48E4Ln3RHP9FwWd5R5cL9Dbnfh77ILgQmKD5i4ySPg95j51bgW4RAtk+qtxVaxybV 9QOr+BBMvSpncZ69LxbABlg3wCMZEicivX5+O7fXsnPSYqFDsQRQQezzsLOBrkmQ6pXhACAi6fT mG1lO3My3EU6+CeEkzIkjtmiJMpxfXWfR0/lEsjt7RVM+f0VcT148OdNRDfisjkKjoIvlMKItXb +hYTD4LkgI/dgz5LDvK4= X-Received: by 2002:a05:600c:500a:b0:43b:ce3c:19d0 with SMTP id 5b1f17b1804b1-43ed0da06f1mr4398285e9.29.1743724816532; Thu, 03 Apr 2025 17:00:16 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1630de9sm34052135e9.1.2025.04.03.17.00.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 17/39] target/arm: Restrict inclusion of 'multiprocessing.h' Date: Fri, 4 Apr 2025 01:57:59 +0200 Message-ID: <20250403235821.9909-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 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 3705b34285b..1a1ae229e1d 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 b1aa482c726..6f62745d7f6 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -53,6 +53,7 @@ #include "qemu/target_info-qom.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 Thu Apr 3 23:58:00 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: 878061 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530151wrs; Thu, 3 Apr 2025 17:00:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXkIp/7F8E38w1yQ0HeuOJ2UIqjDIqILRP3W2JyLDau7vBTlYEvVpdt3HHIxADgC/Q8Qu5Iw==@linaro.org X-Google-Smtp-Source: AGHT+IHIkca6FAXJtNay9iKyPYp2/qzxCutkumjUCO5Gg6tQx8PAhP2eWyODi0hs3JV2guNOYsKb X-Received: by 2002:a05:6214:2a81:b0:6d8:8466:d205 with SMTP id 6a1803df08f44-6f00de6fce9mr12667016d6.6.1743724841129; Thu, 03 Apr 2025 17:00:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724841; cv=none; d=google.com; s=arc-20240605; b=FuJkxBaIqvlIkVsIyRdYH31M6V1Y01BtxhLfjqroJl6YIRkxmyZc2s2E+chDLo4Db2 dGgH/pNtb2hsXY2u0dcWNWQZmbv+fGUw4QdYxi6zPzN0MYVpl+huMZqpTJqj8TT1NZEt Ix/7zZBU+gQ5b5Pn0Dob/LLM6sSWzneQ2Fa56bItIrHnKP6hoZqmRxvdeczWoz7VqvGW 0MW7IlTwdzSkZp8DWilOsJYZyShd09+Ty5+NEYNqVCA5P7VCQOa/NXjMqPaxlW35USKM UDOrRj5T+RVqiZZ4rNtxqpM3EC333K7N56RfMUVWdUo826/DyOGUNZTT2+cN8QhLPkNK SChg== 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=32V1HojRNsh/T5N/dXOEuwUaz3gtbYi6NWT44YAtRCI=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=IXvzT9yBBhDYK00AnQLRvQ3P08k2DKAfYLnYURMbxApS20kaRTgPNsljjJN7pEYcCa siJMiusaUgSbuzVX19pF/MkrjT2WSqKLB6cS8MwIVdln+eIYrgym/aEx2aWhaJkEC4rm ctp9zj1pEOooNSU1rMxhPpD1J/w/h895DKxdh8Jv5zrzpwzKyDnc+ue+ay25j0Fh6TvC v0HNOhWWCrh/sj0D7xb9DwIYCVbCe15qYCIKi4yoT5lgFaUd3knlpogOBv4nD6J8IAkN 8pWKkB183M2xacuc4Pgs5/x4W6d4k/lkvKv4baZcsgX+Kh3Q9gjHAdMJFZvWaWoHvBqq CdoQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e0ZAfoRk; 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-6ef0efc56b1si21354716d6.33.2025.04.03.17.00.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00: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=e0ZAfoRk; 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 1u0UU0-00030E-UF; Thu, 03 Apr 2025 20:00:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UTy-0002km-O2 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:26 -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 1u0UTw-0002yE-KZ for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:26 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39c0e0bc733so1224932f8f.1 for ; Thu, 03 Apr 2025 17:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724822; x=1744329622; 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=32V1HojRNsh/T5N/dXOEuwUaz3gtbYi6NWT44YAtRCI=; b=e0ZAfoRk3rLy+n5YUJjuSkWWgmfyx2GJWnmyg4SBNloS4RzPwo2oFilH7fohcxLmd2 weeyvAvPCkfJQoPT5BCFhrwUsehnxBciiBUl5iNVbTl0WXiZwu3pStvm/S3v/tXjdwjS VL+5DzvL9YJ8ggLW6jmHYl55uu5BakpDe46UA791QqgboXhzXL3qZbrCbkZ7FuYTI1YG rlomLsHfgUdgue2cU4t4Jjrvnd9vNINJBmyw2QvS0dsQV9fggBAeApNmW4PCO0DoxsLh MhWrDZ5vOqEnX/GvOexV7uOFiVFg4XkhfTrgZZCDmrloLJqREWnCdhJH7XePvwjFALCi n6Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724822; x=1744329622; 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=32V1HojRNsh/T5N/dXOEuwUaz3gtbYi6NWT44YAtRCI=; b=sLCxnPibVKIz/uznOs9ZnOz17QMt9vdcd/bwCFE2AjZPqnEGdtuGyB6bX9QDFm8BaM Iq5HJsjKuVq3a2GXeNnS/IOm1KKNoMe/4/bVOTSPRkGIcHO1OAjadsbkCUJyBJzouVu7 mjMftJwW7xsYplQ7U1DjOgsWkiMWtYefw1OQiV6wSRWyPuIp6OeM7w14KPp3vBpdf5J+ U3m7CVPw9txK9VsGJxglWG70GcLOOkiSfSFStldkFjW6bQ54gpdN2a7SLYak5kAw+7GO +IkgrhUnJMMMCclvnxgZYjo9vLTbAoyp2KTWiubkai5a9UyyGd9HR4bnKGXAQtYAR+uF fI9Q== X-Gm-Message-State: AOJu0YwPJCrYdrGBYpDtlIdLeJXpjCfPi5DpKJCGcGHCi4bZ24iHQxbr mD3yXKm6Gd9sgsIhLUATOSaHFxkX7zhMPPwaCJ2TRp4I05xHCCttVfc+LFwkm8atbBDbNYKVT1m s X-Gm-Gg: ASbGncvUhDI9EWhhEGnrucRAJFhLwX+ZcD86cdZ9WT6P0SNcOkLDxoirHrVoCbszS8L geZt5xKj7EGkcLB91EsVMh4vOJ4d+EexWRLa/JojrInTOTdyYuqEYnoehHPfPo3cCNhLvpvyhjR jMJaDclzZ9BXjoCOsup2yU1aAJSplWrxXG8+xmurSGvvjjBbyY6tf9VjF4VXpy+ipkBcXgch6Os R2YqfUC4zCBpBphf48zifWqPEbQjiuyY/HlEHDo5hHYhu8qFwa4ZtxinSXZUTjvZdw/sM3GI4B2 0Bczi06LRrVtRMYYxdJrF/p6dKWOJL1auaBjIQTdhvpxsFSTV50IbDTF4lqwmgIZMVQBfeRsbtx KI1CRG405VveHlanpOlg= X-Received: by 2002:a5d:64aa:0:b0:39c:dfa:d347 with SMTP id ffacd0b85a97d-39cb36b2afemr845667f8f.2.1743724822630; Thu, 03 Apr 2025 17:00:22 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a67a1sm2931343f8f.24.2025.04.03.17.00.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 18/39] target/arm: Move some definitions from 'cpu.h' to 'multiprocessing.h' Date: Fri, 4 Apr 2025 01:58:00 +0200 Message-ID: <20250403235821.9909-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 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 1a1ae229e1d..0db7292698c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1158,23 +1158,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 1f994ba26c6..4438402340b 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 dce7255a2c0..37bfeef304d 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" static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_SRAM] = 0x10000000, diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 04439364370..01e6e2fb052 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 f182accc47c..3987e55355b 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 112cbbf29e6..90fbb56ba7a 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 fa117bf1511..9bb5b0553a2 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 97de8c7e939..a28acdecf3e 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 Thu Apr 3 23:58:01 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: 878072 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530361wrs; Thu, 3 Apr 2025 17:01:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDXtDtaA3IXp9wusopuwDrM6ha2Zxuv6KFXgL/1nFi+mp51GHHO03JWHabYSr1YOJoeK4Lqw==@linaro.org X-Google-Smtp-Source: AGHT+IE13bsVPTIPbffC9GcwmXIwymOBqiihlSD14qfHRWtc9Rp0GB7R3YQZz1G/zzBE4G/7fjRk X-Received: by 2002:a05:6214:1d2d:b0:6e8:fad9:c688 with SMTP id 6a1803df08f44-6f00debc410mr18150696d6.16.1743724864358; Thu, 03 Apr 2025 17:01:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724864; cv=none; d=google.com; s=arc-20240605; b=BLjs7Dcx3W6ywoAYYw725MgPqEjHmYX2a5bG752bevHuD5xdyXkfyaSJLBC3c2SAjM 6qPQybiWB/oj4+HCGF1Raw+Vz8VtqPSJ90op3QxmybQ2Um3onK/DGKXFiZcwxyQJzsTB oAkcNBjOetKiCbPovVmf63hSIxk+ww4lnktQs1MjN6LBJ4KSq5M1bxpT4BJxmElpQX/w ey4lNORYRWXngJHdfkK29KvmIBrUPkUvAr+KZ49OiRLxChLhGE9XxTDuemanNwU9NkZq jiQjeWyQ2FFMwM3SierxuYY2yAv+DY9+qlShTCBRMTV4ocvUn64P3xdgYrM/FdD8k4/s pJXg== 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=qWzncIlD/jPDOChfnrDcKNqYdRNXnmA3myNJZtWNdQo=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=R3U3ewOQLu9i9yLl6RpcUZ+KOsbnJXf57md59ST31fS6sh0S7TOsjWokvl0EaJBeou cPlNVM5aQE6YthYqslSjtZ++aDK18YgrIikd3OuWkdHSjeOjmIMf5gggR/3RM0bhBuWa EoQPt029H391s3cGlbCur0/8j8H3qTZ7sbU3TTQFxIHjRKwGeTB4wl8PqAAXO2zUVyGf tAnsoo9ciNuIEV3XYpWlMHN/x2oMI9aC4iD7h8VX4k59guCNGYEpzyIZ54h3DWj00ppq 04YhMJmClu1RnClVNYQXltuWpn2jyk75f180X3y/EFG/HldPyfNPe6WtDJvqzr5TqCwn +P4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RAf1QEd6; 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-7c76ea5a04esi215674285a.264.2025.04.03.17.01.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01: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=RAf1QEd6; 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 1u0UUA-0003zg-Ix; Thu, 03 Apr 2025 20:00:39 -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 1u0UU5-0003cX-SZ for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:34 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UU3-0002zT-11 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:33 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso15510545e9.3 for ; Thu, 03 Apr 2025 17:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724829; x=1744329629; 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=qWzncIlD/jPDOChfnrDcKNqYdRNXnmA3myNJZtWNdQo=; b=RAf1QEd6y4EmPzQW5alBRJhZA9hS00J3OS3cXfiZ4qtNFdLcdgyNF/PnxXAhAC87go Fpcy7HpKVBbpz0ney/gY4vIg0OFuc70HtaES0hss+GsZ0XXJdsUEQp+Wx/9bS+GVIO6w 23TgdooopUrj2BOsppaw1gGGYM/xqEu5PugrMzOSOxSZoRZKuycs2FDx0znIINvJo9Ce MMIXUjCRH9Hq3If7vEj7hD/ZkU+UWSY9vNtT++BWbtG4qzaxAZjvEOFQJCEXYeIsBV98 XiDBZ1VxYRsjzpufQF+C6g/TKZFdYZH8wkWGdKU3+PTKVvYzmElPS4bkBMiJwQoceGrv ryyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724829; x=1744329629; 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=qWzncIlD/jPDOChfnrDcKNqYdRNXnmA3myNJZtWNdQo=; b=JHTOMvzREm7Nq8QdKz4+/XfqMPeEmIa2a7aPb97MZ8oWNCNoUFCG6xBFn8az4qbMBp 2qcQ3JAWTuR2jiTNefpF0dXPB2a6uKLAaQm79S7MQjU5umx+Lqlrmgqo8MjeAalg6FmG MQnHED2LDMMt4kJu5YfFNyy/jXILout1Tx90Q4YiPVGVnEIPhStiEPNq4dP7SFOda4Wu R6KvEQ8PCCbJ/rpo9xNzIZ50r0/1sX48MCRhRVMKBKeyOcf8z2Ohrko+2N+kYDoW/nQS G1lvCUxyt9qJBiBtGpK+I5+38QNYmhJkNs+irbMkpSOkDSogO5JDiard67hE/hpw1tYt lVWA== X-Gm-Message-State: AOJu0YwLM+ULLg7JQlvvsFSCbfpBB7i7VVMeqx29IskteIaHwAXLF8pm 045fk2SEvhRokeEI3ISr6Q3ihyk1Y3iHcw+I9HSK9bX8+jz/1pCr2Lvz6++lk2V2Bp44N7Q1OC2 a X-Gm-Gg: ASbGncsCUOBg8cwqaETId9El3uS/1HnXsRvHOfhTMkNGoMqYGe99Rr2LH3YYI1hognb 6cnBnPuhp5tpbtZ6zdIe25CdH5yF0wBv7p8jFf2+hMpGIYKDZR8WJpPB8Yo0/GpIXUAXFwYFntt 2Y88zKdC1h1nty3D6La+Yj7je8GN5jips05pDio4yswxLUoanGto61EQ8vrj1NUrXBuBWNmDBez 4O7NeiOVo6hgvfuGJnlOIp3q4yoz+ER0SF7ah/X1Rzye9EcNmoyUEDEb2nLHOndcf2dZdb6rlou TeM12BDew+nn/alXVSyCtZcs+uT72GXnQSd0uSf8wA1maicTF/54n3ExLU+8ML1oojkxbda7XZF Q9lU6EEcN5dRm4YJ+juk= X-Received: by 2002:a05:600c:4503:b0:43c:f78d:82eb with SMTP id 5b1f17b1804b1-43ecf8eb2bbmr7344195e9.15.1743724829228; Thu, 03 Apr 2025 17:00:29 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ea8d16049sm61437675e9.0.2025.04.03.17.00.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 19/39] hw/arm: Include missing 'target/arm/gtimer.h' header Date: Fri, 4 Apr 2025 01:58:01 +0200 Message-ID: <20250403235821.9909-20-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 37bfeef304d..5c2481225dd 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" static const hwaddr aspeed_soc_ast2700_memmap[] = { diff --git a/hw/arm/bcm2838.c b/hw/arm/bcm2838.c index ddb7c5f757a..38d9b785a75 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 01e6e2fb052..ca40df3db75 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 2cf5eeaf313..180feca9d80 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 604f6845fde..37c0de28a92 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 3987e55355b..2f11bc53a86 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 9bb5b0553a2..25652b16f0c 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 38d49cbb9d8..005f84082af 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -25,6 +25,7 @@ #include "cpu-features.h" #include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" +#include "target/arm/gtimer.h" #include "cpregs.h" #define SIGNBIT (uint32_t)0x80000000 From patchwork Thu Apr 3 23:58:02 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: 878066 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530231wrs; Thu, 3 Apr 2025 17:00:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU3M1gF4eOx2D9Ew4elvaft9oyiZRFRDCQlWhxtpkb1pyuPgUbOrjmx6Qxqx7Ryj9Cx9j4BTA==@linaro.org X-Google-Smtp-Source: AGHT+IHFaiCGrcUq+Jqad3NbAQ+jg1G5FoAQfOHlk5odFqNuslbhFgd3xXgaWSJwNny0Dkda10ui X-Received: by 2002:a05:620a:1723:b0:7c5:94a1:7975 with SMTP id af79cd13be357-7c774c0ca35mr167105085a.0.1743724850211; Thu, 03 Apr 2025 17:00:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724850; cv=none; d=google.com; s=arc-20240605; b=lS4WoEj4znCublvFputSc5SxUw/VFK5U9Lrc5b1xc71nNfuWPO8osevRnV8oiQxT31 flaLL5kGPew1uHCNfWjDNQWpYmmYq0O3fjT0lClzIOV/PdvhUk9DLhkHlyMnzeWuBc8u tQnWjrNU9eP2wPvmyGnYYW/3l+A6iE8QdJuqXnCvjTegr6GclYm90p9dLhseg27wNZal b/DprX3NlFIUW1+/N0sTDfgwo7yei3IESPX/+GmvBFT9nILGaqEgkie5/sUuNO0Gt1wW +fUsJeHNZRubyhtCQ4va9lFlKMsLc29fTsgK1q2j/9871Kh9u9FxsrVfg4aJdARAxBfQ erqQ== 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=or6OvOaPpaAPWohLocohfxEQCN6eFmQL7R7CAjfUSNs=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=dliWkhc4KtWRwZcjzoI6I/9Zv0rxZpJR4NtuN+njYucs+tfWvYhxmeAzzHStrtXbEa gW39FkJRSEjSuUClbuK8eiI90rKkCy3nh1JOjDjSmSwPhFmpRSQS4FDnRwSVHeqLQAqT vIroqsSuBkBaX2IA8V0B4Jv+sCKyNd47iWId6I8neR1WaXRSJCGhEc+zBWBj+1Il7qwA S67xHdtMBNnY1mZrL6eMDkSwpqV/d708K1jCDGzLnMPQRqm6EACgWiWBjnSKcgIB9b6l DulUd/gzwcFzfAmk53l7+p2Puh/sY4OI4EhPVnRdrCEc+FWTAQCr2wDQu3FY+iYw/+n3 tHcw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gZH65eAt; 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-7c76ea91113si205781885a.369.2025.04.03.17.00.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:00:50 -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=gZH65eAt; 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 1u0UUG-0004Zc-C6; Thu, 03 Apr 2025 20:00:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UUD-0004Ig-5c for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:41 -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 1u0UUA-00031K-Oh for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:40 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39c266c1389so996799f8f.1 for ; Thu, 03 Apr 2025 17:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724837; x=1744329637; 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=or6OvOaPpaAPWohLocohfxEQCN6eFmQL7R7CAjfUSNs=; b=gZH65eAtsXQXUvRDCd8CMW+zoqw47lu1f+cJFkTm8ejuVVsngoQEvsXafZw62WfPNG QLhW55DXHFpK7dCf9TLxn7c4f2khyLvK7swV5hPbXhnu6yWyLpTfJcxGbmeN+n2OlYi0 SEUsIjGRTmjbXORUml+nhFQIdfCvqfRX5zHJbJzsAAAlfJr3NmZru1/nUB52CwPt0CpC 6y8yGMYz9IieRGlCqyt0HPwMas6zHu9QPKl4A8MClQ5oiSPoKqtyJ9S8wXkPwFmpynss ANs06LhNtQ03f8imxnHLhBqUHbXyO5jCdaFbFK+lEJhVhuhdaGGMHwV9s4V2eELWWdnu T6zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724837; x=1744329637; 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=or6OvOaPpaAPWohLocohfxEQCN6eFmQL7R7CAjfUSNs=; b=fMHmeBW/xvX+2cnCSMGT6n+9pC3GZcVsqIoQ56b7OQdcdumAbtqLSGj0P3zRwPGwNM 7NjQLapZnsiSm5Ts2COteoLr61yPT9otCZ/VjkimeUCIZ5395hfd5MunNEuxR6CQNy64 xDVKAVmAdsc6xJSKXWk5H9nvB8kPBn3iLKaLJhYYNu12pQUjXJnFyIUxHIUDaXqfo52i WnV3/xxM6qizvJy3kkgNV4kaaayoNkki2G8DgqmZ2+wl7C+q5FotrFtieb/0lcKygHQO DhIJ426xjwPrx9EyIWsr6z6o7fdyrSacWseJIZL4DawQy07v832g8SOXxWJxAYJW4tL9 jP8A== X-Gm-Message-State: AOJu0Yw4WJenIq2ZVoIO3VjQtKziFRhi3eZXkr5uiV7duNxKI3nI7rZm qp4iXwj1bPn30SNdvfJbXasgXhv4z7IWKhNbLMsp9q4zLMEwiM1p5tVZoUendes1kg/PJHyX8vq j X-Gm-Gg: ASbGnctzSSo3LBMQR/YcMGC+I3Qk9P1fE+G29xb0I7H5qX/f0cf9GyxLga/uzKRHsw1 WfmfyIjiWxPjw5GibGnKL8DvYen9LeJSoib6tfXEjyjfgn6CCMsya68AYdOqXkTfqKhk9na7dQT 8eWXRRpXf/HIp63wEFOa9YpZb2V2k+6arDsEa/dGM3x7EJoCbmjQ2b/zbRR/C5/Pzb/pu0mWvEV ZPB4edjjMWnjCRJgkgMVQn4FR4zYyebnm1xrk3g4PrFw/3k6O+1AoikqqTrzO3TxCoRmlaxpOhG ECwO1RlVvidCI+jOc/FJBAgRa0V9WcArt7FuTRYjhEVR4rQBwNj6mNviz4Y7fb6XQOF2KD5c4fv 2JR+po18mpX9QYmfihTnqFlW9KO0QxQ== X-Received: by 2002:adf:b644:0:b0:39c:c64e:cf58 with SMTP id ffacd0b85a97d-39d146625c5mr337152f8f.55.1743724836794; Thu, 03 Apr 2025 17:00:36 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a6c89sm2946609f8f.28.2025.04.03.17.00.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 20/39] target/arm: Extract PSCI definitions to 'psci.h' Date: Fri, 4 Apr 2025 01:58:02 +0200 Message-ID: <20250403235821.9909-21-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 | 6 ------ 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, 37 insertions(+), 7 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 0db7292698c..930c5366029 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3104,12 +3104,6 @@ static inline bool bswap_code(bool sctlr_b) void cpu_get_tb_cpu_state(CPUARMState *env, vaddr *pc, uint64_t *cs_base, uint32_t *flags); -enum { - QEMU_PSCI_CONDUIT_DISABLED = 0, - QEMU_PSCI_CONDUIT_SMC = 1, - QEMU_PSCI_CONDUIT_HVC = 2, -}; - #ifndef CONFIG_USER_ONLY /* Return the address space index to use for a memory access */ static inline int arm_asidx_from_attrs(CPUState *cs, MemTxAttrs attrs) 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 0caa08631ad..16fb2508d30 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 6e64ec4ea54..c8a99b2c49e 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" static void imx8mp_evk_init(MachineState *machine) { 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 90fbb56ba7a..1f592627c99 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 3ac8f8e1786..da61af1d359 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 a96452f17a4..fe2dec9500f 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 e19c4d9ef58..94fad8e60f2 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 88b1eafab4d..902ee65ca5f 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 25652b16f0c..b73b6fb8115 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 7fb6e886306..48238ae0b20 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 ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */ diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 34ca36fab55..f617e73feae 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 005f84082af..6e9db2e77e2 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -26,6 +26,7 @@ #include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.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 Thu Apr 3 23:58:03 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: 878079 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530395wrs; Thu, 3 Apr 2025 17:01:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwFscZtiP8S5hBZjXqLOj0T5/OayNwqiZ+WudN6zhmE2Fwo293PDQjuuCiLCi81kIGWSixYg==@linaro.org X-Google-Smtp-Source: AGHT+IFNkyjpUQgBF/GUG638wJ/H8U06U3VuhCfB1CarbVTNGVqS7vB7xdgeGrA6ZZuz4cBsEdHh X-Received: by 2002:ac8:58c2:0:b0:476:639e:edf1 with SMTP id d75a77b69052e-47924946718mr21055511cf.23.1743724866639; Thu, 03 Apr 2025 17:01:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724866; cv=none; d=google.com; s=arc-20240605; b=ZeNfUijP9mQqpcjKKbi/gusjxTqKxg0QCQ9GLL5R8XQ2u+iSmMRlhs/Hf0j7vYAZZR ExVOT3SfISmEnoBddgeEowd1Da8dxupPRj7oNj1COLmxqgLf0+xAOnRNfATHN2G7ZOqZ XeHfswzh7jk4IUUwTFMjg4Np3TJgxa1BkY6F5isuyQeJZC0Plt3snwiAsc0ADWVdv+UW brFQFWF6Zce6xB2bNHD0BQxAvAfksN3yb+AKM1judEELqWvTX6va59uElL1v7yQr3hyi GXwGQdy94aofLIjSIJpuDnLk+igTDnsxk5G86bTpjqv20nUV0+fug4mLB3NA/wyJW9w7 xEpg== 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=Wr+KhDAwxc2q6VRSwbOelX+XVOHTzw66xSd8DPCtE8A=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=XSjBVp+mcjXq5ojcYyQV4C4SgSw7aAZ+Jm2KcG4V8KSQajMZuu9yH17yGUzGrtCyMd tc3QMAQe10ko/0TlKyX250/Qzx9sPMFHjHMJ5Yo9HcTUF6VisxigHwqbqoFC5Tp3Ytvs bnwwGH2UhKB3dNYvACehqnVsS6UqB+LDUQfxxhQHECCBK54kwK6MSFWmxnXf6h9TVlUO v3+DXzkpZWEo49EHTpy1E8yDV2FLqDzuhHmscRVNV889LJYFSQvRgQ+nrQBX31T4HkBd 4JfJGaKLtg6aaxmAjG+x7EzUUCwYqoCuv5YpFyOtAKQ6wLfAtC9FKuQ8QBcR6FU8AfN+ 47Zg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j3JiLh24; 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-4791b198823si21231641cf.390.2025.04.03.17.01.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01:06 -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=j3JiLh24; 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 1u0UUR-0005I5-On; Thu, 03 Apr 2025 20:00:57 -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 1u0UUJ-0004yL-80 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:47 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UUH-00032J-13 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:46 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-39ac56756f6so1201676f8f.2 for ; Thu, 03 Apr 2025 17:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724843; x=1744329643; 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=Wr+KhDAwxc2q6VRSwbOelX+XVOHTzw66xSd8DPCtE8A=; b=j3JiLh240+BmGH5ottVe6WNFJO9tr9SE12SY7z/3hoXRnED0WVd+SgAgKmy8LqXYWo t+wGAxTFaQU+6U1E7tMZqR0Pz1fJVzFt2QOX6rVS+O/SMu1S9V0hrHT466kDK/JVpIwi mbS4ZFLIBhCjtaT7ZkWCQMRNW2k7zpOf1n8It/VhRt8deWLtLGTNHnwwtQdSqGoQTQMR wFnQi/zbneerig6aiVnkwsR/8T4ULPvEGH8QR5A7lldz7yrCC3V9wfMaKlRwbsS67XPq Wk/UDoj2jBHNdNvsl3GGdZwUEFEagmeJmAPoiI2bzC5NUcqGIShcU0lnwfy0m70YqZSF iahg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724843; x=1744329643; 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=Wr+KhDAwxc2q6VRSwbOelX+XVOHTzw66xSd8DPCtE8A=; b=ZGW5GMSRFHvd8efQ/FHtxXX71owqJZ5ryhZ29lnEkekh0gx5I+SEXBmOqRY643E4C6 XUcsdkzFEPLMuQKRkQpnQc1h+lKaN9cKLury4s2giv1QAKNPkxvqdLz1ElDQc9naxQl0 Ix1LsyZXdf5TENV7IMuOxEPfQyjhOjluKtDFIuRl+gXAkOpYotsSc930jYC26QeOrtVd a90jr1K5wD6gynn0ksYk9QCSi8zBhqEz4S4F/Y2wUW0hbXvzdZJ1KlX/ysGXh4+NPDBP o0UO5pUcSZ1DyyljI+uyDIrGqAiMTJlrL2CryXn77BqIYUw7l4DIgh1FBS+u5CoDPPH7 ALpQ== X-Gm-Message-State: AOJu0YxvOsouudE4OO3CfBFzGf7HFeNAgwj7NQ0Sk/Z/L/C5lvBENrOZ 29ZdqdjqbZotTiRPdW9yjRL2GlP2rSgdZsMokfDVTgG5Ojc/vggucnrWGDra10YZjwm5hbHjK4s 3 X-Gm-Gg: ASbGncsGI8hDC63hirA3VcfwUblluD1Asl++wAwdrIIxPC0b1PNyRdIRdQmsobXtzNA JfYHt5AfsDRmrkmLj5HH///45ymhCBeg4+nz/0ZsiJuTXUgNepjgTK4OweZkfhNcqS2tRztWp3a QmyxLTPV9UZ4Kyq+GxOJisJCGSTZ+LBXQ7wgblfCgaY60nJqAaW4GAyo/pIZpg1idLhMyaW48HM s3epGx1fIR7kQ1wruDZjhwCaqxig36qbOhH0NWqB0A1VTyD7shWXf0R+yCJL1xtLrUkwiVQtR3r 3PuS+zy/l4z/xV5RySKwcf6am3glP/TTA49MuKM0bCv1gc0mcwNqsB5apBiniAoJZsyYVQasYWb 8svewbcxOmYy03MzhVoE= X-Received: by 2002:a05:6000:1887:b0:391:13d6:c9e5 with SMTP id ffacd0b85a97d-39cba9333bemr760470f8f.19.1743724842825; Thu, 03 Apr 2025 17:00:42 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301b42besm2945277f8f.41.2025.04.03.17.00.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 21/39] target/arm: Extract feature definitions to 'cpu_has_feature.h' header Date: Fri, 4 Apr 2025 01:58:03 +0200 Message-ID: <20250403235821.9909-22-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 930c5366029..fd8beb8bcb1 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 */ @@ -2379,59 +2380,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 Thu Apr 3 23:58:04 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: 878091 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530721wrs; Thu, 3 Apr 2025 17:01:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUlP/9+Q8LM5oX7KepYft6Qb8QGuS42zd9KYDR/dxqft7jWHvzxm92fSUa55SeGAj18ifmacA==@linaro.org X-Google-Smtp-Source: AGHT+IEmrruC8bk7fjsQ/bvmy3w82b21a+NGbzRYdEPp6xAUnqwmUavhd+ta2N+HqRWtQFq2LM45 X-Received: by 2002:ac8:1201:0:b0:477:88c8:9907 with SMTP id d75a77b69052e-47924a404f3mr18462931cf.2.1743724900840; Thu, 03 Apr 2025 17:01:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724900; cv=none; d=google.com; s=arc-20240605; b=eHv9B0+4UU/OJVVgvowOyjCHNs7r5v0z8AIukueaOe5W6uFITJE3qrKsF+EJ8vJBwj vSnDga7yLeHDVPtGJyA4iQnJL1DW5UhSdv0ZLDUjlyKSjMwbYr+aplPHDTiJ+baYIqB/ Y2tMuLURPxWMVF1JEiDlCZ6MS25itJ3QjP0Y9n8LSxtM5XBfxg6iY0nHUKFUJJLxJeYl WMwPJFdbkCFH4gWwm7wJTM9lh6kKqKow/zMmVVHISfpk29KoDmDKbcww8uiOzMSIdYUS 3fn7V9dvshIAulDzMPBF7USi6oIsAimBH2PUzXmNz3atH7TgZnDdWBlY+yohlOMSzAF7 K43w== 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=TP105EOAJeVHdN1BZY7s+jUHXieu6gJKrsZ9gC9TZqY=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=hAN6rNsakKFKuUzh+bZt4yHpQryOLDz1qCveY6rsIumORkRrYNNMqMnsFYlYO4tVqO x5UsCNfL7ioCz29s2x2dHrTl2vGhSnbYB3b1JpVlBo8IkkMYDB85vQP8Kp5wKiN4V9Wo 2saqXfAfguCkglrfibH1WPugOeUa/4ML7VRBAf+r5XrEm1UNb9T+7WZD4VT3/EteCssk QmjVLZ5AXteN7lqnv9CcO2cnn6Cn07nqHnJvyY/LqGlDzjLSWAXm+NpO3vM6RFD4W0xq imbtL7ELRpaQtHFCiWWiso4quzhm4M6SLlNzIm45+to7dBWy6o1Ue2ELXopQXLQvHbTj pN3w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Xe/iBpF7"; 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-4791b198d88si20918071cf.384.2025.04.03.17.01.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01:40 -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="Xe/iBpF7"; 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 1u0UUh-0005n9-GJ; Thu, 03 Apr 2025 20:01:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UUO-0005Hf-VZ for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:55 -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 1u0UUN-00033L-5o for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:52 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so18154475e9.1 for ; Thu, 03 Apr 2025 17:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724849; x=1744329649; 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=TP105EOAJeVHdN1BZY7s+jUHXieu6gJKrsZ9gC9TZqY=; b=Xe/iBpF7Jji64IrtJEhEpXiNTAj3VnbLJvXYFh3hhRwbF6odbzlOOV/18b8tPzJz0T tnTFqnZq8K9zMbbTNpSN+utPigB6dqC2HRQalS9fIRvN1P41wYOPy0vxdqMTlKDuR4Us WKv0pZ93A3scedeZMDYqUIViHSyXXKtBJBrEs6RbE7SCiMVSmseDQipaqinIeL/tH0Lj 3gUjwksKULcbDHLqd6CKqE2yTXFz+/gtYOpO/zHvu4k/mBW0x2EULkYWxgC+2De4KTbs MOdp4CFnxCuWy78xCoiY5kpWD2P4UdgJqacYg819Hd6WD00d1q8xYRQfZGpKCPSqShLr rwOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724849; x=1744329649; 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=TP105EOAJeVHdN1BZY7s+jUHXieu6gJKrsZ9gC9TZqY=; b=fru/VDpFBc5g4pQbjYiNmYqt2IvcxQc/l+v6xRxbdfbX1RSmifQ5Wvp6CevwPELNJc obvK7hz/T34xyCyA9WOdxZKpoykUk00RmJtsK+PuqtwZC4yyuWcfALkJ3WXS2HChmfrP yUhZvCb/pq6+fFjABv25B8lNip+8Y/yu0VSeJX/LT6Xx7+VDNTzBCbTr1ozqdRumxihq CezyEfuSBH/IWqW19v20q9T2lB1BCwGlBIt8EUrYdKa/16stB7QRre5mMvY1XlE8v1Ke 2j3S1VauHQ1Gf3x0zbrQTqBOIsoqQMyuzem2cN2nQ2uxK7TxSuNGxU8Ax4mXVdhpXB70 NW4A== X-Gm-Message-State: AOJu0Yw9lisl9swMMvFaAu1RMkmiA7BGGfjWW3Dfg1rnK72iiZR1GuKK +dA2ELz94sCgJe3QyFKKcJ/FQIJCQiDaM2errHZXIHQO23q9xdiFY7cM/bLfil6NSRvmjyoQw/P f X-Gm-Gg: ASbGnctz5ObIZBZeCkWjUS2dxpqWuGMwIuWzRRn2jsVPQ4GcDzQ6sw9ajvX/EUw3uqP Krx6zvEO7/JvqWflTogrQJQ/jg3VuN3HDNuX2Lm4NvuDFDw/RJ6FUab8qDvRoTYJzgzli85QH3b yLgjFS4HyWwSg9kiW8VaUqjRCIkEgrFC/lJc9+7qlEUGvpTmrWBkW/L99RlVfJQz2gw0sIpgg8z rATaebpnMqvg16ReYKsSqdMFD/5JxwpDyDBeni/byTJX0B/EW0OHmUpsW5mNYY6zdiG/PUcs4RN pe2kFC90FZhvXSzCG24iM7Eh6mkrwVsWjKfnfkhAgzuWMxxlWueA22NUIXX2wZRl1ibA/nxlp+M kSeZY1q73at6Yx/UxBts= X-Received: by 2002:a05:6000:4027:b0:39c:140c:308 with SMTP id ffacd0b85a97d-39c2e5f50b6mr4084817f8f.3.1743724849120; Thu, 03 Apr 2025 17:00:49 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec3428298sm31329365e9.8.2025.04.03.17.00.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 22/39] target/arm: Add arm_cpu_has_feature() helper Date: Fri, 4 Apr 2025 01:58:04 +0200 Message-ID: <20250403235821.9909-23-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 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 6f62745d7f6..66a58916fcc 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -55,6 +55,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 Thu Apr 3 23:58:05 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: 878080 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530500wrs; Thu, 3 Apr 2025 17:01:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdDJr0eeZDb+0a3NWmIJ4rxU9fOi7beuLHuThhXNx2UVNnrCdMXfNv4I/reS9i5oUzMBJ7/Q==@linaro.org X-Google-Smtp-Source: AGHT+IH/FlRdDmW6yp+EoPoifF0UxvXvyisDqWlxySQEdircWd2Z7Ut9/ADowgIq/p7qjWAf/2jO X-Received: by 2002:a05:6000:2506:b0:39c:266c:12a5 with SMTP id ffacd0b85a97d-39d0de12554mr478068f8f.13.1743724877001; Thu, 03 Apr 2025 17:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724876; cv=none; d=google.com; s=arc-20240605; b=C1o4HhmPYRZVYPz02HtOb7VGALrhDKmrk5fzIWgOi8NrAp5P7uPIu5XhemcuCua9x0 ElLmeVlgfhl/r8COCY7WdYnXbxFeqwUGa5sa4psnMWpXjiYVRPyXbVJMDR/CA0ObnQ5H 4XiwFbxB5prln47Uq436PQ3irRTWmVbYt2sjda5EtvFqY4/PF6qk9na/XNBud7Ea7J/v hfEwBLcnep7b5pdrIXMk9Y1/8tBUuDsFhhwo/jm67sBe+YrgI07bHCozo6NER7Zx2wGM 6QzwB+nVNN+75cG1S2XReFLSKvvU9MC+vh4nbUVaIZyu5Rhbc7shYmdCEg7YLQYeObkb 5Yow== 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=Cdt0hEBhBGBOeVvjrYC1cczHi2xnkVQcQE65ySBiFwY=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=eOk+n8Y1hlSrwxrztgehVzLDv7WyNFhlO1yCyANPzY4n2R0dcXogNLX0oVcbmE3+jk dDtIl4D/A7ZcL355qog3x+kVpuuVMfD/btSHwIfrfh/CTOmQbdAIHejcbRHnMmeBPkEk savbI7l3EPGX3+9EzMajYdDsqB/QmxpDelKXdLFr8InXjmKQo7i8MkajLVNEUw1d7mPY Gf1zybP5b1H9+BV5XkkLdwsQpCvZLcZLHyR/K8xg+3NPsUHDlTmT+e02+X4hDkHBGU2U 6cqG/VKqki9NEFFGYi8iOwWsu4zNyEU9YJontraD8n1EO6oaDtYWXNMYRIluq03mlhXl vcwg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ShBQnjBw; 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 ffacd0b85a97d-39c301a6ba0si1750403f8f.221.2025.04.03.17.01.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01:16 -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=ShBQnjBw; 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 1u0UUi-0005t6-A3; Thu, 03 Apr 2025 20:01: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 1u0UUW-0005QF-13 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:02 -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 1u0UUU-00034i-EM for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:00:59 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso14790655e9.0 for ; Thu, 03 Apr 2025 17:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724856; x=1744329656; 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=Cdt0hEBhBGBOeVvjrYC1cczHi2xnkVQcQE65ySBiFwY=; b=ShBQnjBwxUKy/8+CmC//p+Dj6h5WDUXtIWmObLxHv5h44GMqyyvaZygtHpSEJQniXp 30eDZUIqLkFAjlSdFTaPWSzqLvWFcQx6bdm9gvepcOBIHPMkmHtaHYoWdJZSTKjWjbej fzPRuJOanxonssZxp0kckf8h8h9WRbgOaFzjzaeY9WpK6zdlWHAohgq5/ie8FW3kCbQK m4eBllBAD2crIyr1sk2zgab8jE69NI1k5V/8cPa1fjzKdY83LaQIz6iEpuPnNFb5BgNd CTwCdCS1wFqWnamYPTXwNn0WlTO2la/htKK2OgUaySQMHeb1E0qk8xuCZ+bBHf1KOhVt ztaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724856; x=1744329656; 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=Cdt0hEBhBGBOeVvjrYC1cczHi2xnkVQcQE65ySBiFwY=; b=fmK9giOyKt/PDV6O8gWx3CWAz3kqns41VgYbQ8aF2QX7OigWcW7aSvDCx7FIX/fZKi Pd3aR8emcEcFSX+WFXBgmuBgDXYi3KQup0VqtigdbuXHKKU65065L6ZKLSEIzDgFe8FS n9iqbmQUNfy5aT77+vwNo0DDHd0ZXzTTeZAIrFYA1nEahsbk5mZvjrQCBbg7AMsJMzW7 t+fcV+o3Qs6qjNFmpcdF0OB0w5xLGLZcl2nQZEivPJkFi7O76q4F0KcBHEbC91yLhnjc e8LbSTL/V/JfFwWUPuUp4mS3vBUPUL5WTu8AQaIHRFCcn2VRO5SYcsO0OU6aPuLyHQ1Y LBEQ== X-Gm-Message-State: AOJu0Yw5GrJd48e+UwDIm5FeUITUVHSf3IHO3hzNzBl/A3dInINxwT+i UodvoWrobu0ZIBpQ6Q5ObMdqyabnieyRsB+xos/x02mO7s/AuWFHMGn5fbsuu+fmwbTlsXw1yOH Q X-Gm-Gg: ASbGncvsjKNNu5FAVxwulmJN4OSn5ACAnOJeM86HjApCt1TysP/4/7XXIApAyC8ytkj MnbqLlfK2IR6v2sRaB7YrBe8rfesCoHEV4mI0d2UHYlddYu7EhUTc6H0n72aGz9k2DI9wu8oC6S /P0EFNAAGiWByLbYMZV+/7PO6DhDwLcw3Xx+7cNkn63ykNhbqQKrepdsLjKL5fLkdWrx/wn0rsH 5FUb65L9OsMuFJseVGmraEevhw4+MgDryeQgcEzdY9Fm2u9pLJgH6MyeDcf0nXQWVb7Gmr4SEL6 IIDcK14AmI19XuWJTJOjGOMkQns0FR+TQN+TkE8lRHtgjCgUfjeYqR0RnS2XrLAvD8MdT7lruL4 BVan7uzKpow08Ml1CCw0= X-Received: by 2002:a5d:5f83:0:b0:390:ee01:68fa with SMTP id ffacd0b85a97d-39d0de2564cmr576097f8f.24.1743724856425; Thu, 03 Apr 2025 17:00:56 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec3669d0fsm31250975e9.36.2025.04.03.17.00.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:00:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 23/39] hw/arm/realview: Replace arm_feature() -> arm_cpu_has_feature() Date: Fri, 4 Apr 2025 01:58:05 +0200 Message-ID: <20250403235821.9909-24-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 f81d084eb80..48cfe05add0 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 Thu Apr 3 23:58:06 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: 878093 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530790wrs; Thu, 3 Apr 2025 17:01:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV73Xyc2moXf6U2F1npM6jxU7Uc3O3sIqcpsTc70x0ad3/lmbgDG7Xjm64GKAbpezx/Vw8Nvw==@linaro.org X-Google-Smtp-Source: AGHT+IGpXKGTSz6FvSGcoYosvJB0dJsmyc7qiXyvI4Te5x8dNRL325K+e7f0B9lTswftvsX9HBIO X-Received: by 2002:a05:6214:490:b0:6e6:684f:7f78 with SMTP id 6a1803df08f44-6f0584a3f80mr16725906d6.3.1743724909242; Thu, 03 Apr 2025 17:01:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724909; cv=none; d=google.com; s=arc-20240605; b=iJ8hCfWPpz7VrjhIz+q4AOJqHVbuRL7t38HM4v4c813Abw5/D7BT0i2Jui6muRXyV/ BCXoC+Pr183m3463Uyn5ruVV86PBC2MJel/n0vAK1ryfVlVMBKzOQF9olhf83PjYBRob Gr0p+QcL0qISwdH7G3draq08q/89bFhUUsnJBRIB5et0/iMm5xYw519uZrq3GMLZczOy dWEMeOsWHDakuwLw87ZC4O8zUnWg9xsXhsRqNTgZehaTyyyZlmwrHi9uwxHoyS9j+Qz5 +aBV6OGyPzGqftMQl/XVM+/lYaOo8oth2MgwpTqA7IAL3ckWUANThwraljM3PwI2r27l 9bIA== 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=Ql/mC2IOtWZLIqcQeQJUXW7zdNSSuVI9j8UwEDiydo8=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=GDprQa9ltCm9BZmkvoB8VkeYG5EJ5DPnngiZdj+kKrizzlMr5RphJKsIt3eS/8lktC QKZQm9O+e6aswzCHPFA5gyK23kdFzpX9DmxRynJx0ro6qmBeOVY+/joOdbUt4CI6aEbe NbDitKENjjoJBOXmeRppRJv2O3m9kC9CNqqA75eaHZqdnh3ENfhAOcsQsjqsDn+7zjbF Mr2Mj7EkVXQGFxK3t0/OmHpaU7dSTiZ/i6SEKBP3DgjWbfouyisf+oWI7+RZBLy77otT PHMADZtWGBgbcHh0p1/axlC+u+DHe5Ur+hdpugsyPYYRvRtAtzmPlgTkw6eFAyGKyyz/ S60Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SYK9tOQ2; 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-6ef0f10d648si20621676d6.196.2025.04.03.17.01.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01:49 -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=SYK9tOQ2; 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 1u0UUl-0006Am-O1; Thu, 03 Apr 2025 20:01:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UUb-0005ag-JY for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:08 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UUZ-00035b-Pf for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:05 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso1633971f8f.1 for ; Thu, 03 Apr 2025 17:01:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724862; x=1744329662; 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=Ql/mC2IOtWZLIqcQeQJUXW7zdNSSuVI9j8UwEDiydo8=; b=SYK9tOQ2hGvL8WackKLb108UKotVCoUgcaNJqTuo1dhpbT7XPDWi/RoOoFL2Ao5hRZ PzsL+Q1uytbQbYnr2HrMIsXzDL+MXpOVVqvh3gT9p8MzojlOgX6VtL10wbFfn0STxr2K 1n1Eiq1lwr61x2RoC27UyP9FYJ0wtmEhmcr8/0XgbKP7FyCBWpIiFDYMkowk10Em1PzR fKmukm8Fay1To3xnh5LACg3injnta+vRCcUO5wZ+Kew6D4KqXhmIWqFcdaM5eU7RZ7Jt BpKj0lNl7Z6utZVDLpOU6LNzCaEJBBaj2yNG/hidl+tgX4nT1aPc0f7M0yU5+mInwsiu qaCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724862; x=1744329662; 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=Ql/mC2IOtWZLIqcQeQJUXW7zdNSSuVI9j8UwEDiydo8=; b=CwOAVvPJ/8afLRDmzzvFzCroDl9/YOM7+w2pq03xkVRwghV7+IGW/Y5wRQKiKjL+h0 WYEwnfh7o6YFmGnVgFk/st+j8pgnL99QG2w/BQ5deIHILV1DURolu7jEig6E4wutUfr/ HLSgRGFu2jWOcFIkzZHdti3kEcmfcFq92tsAnS1gZWcws4eUf0/2Hp3Xcq75/tsMDrOZ 8A1Ku8m8R6y7hCPQx9pgAJroZUXguCn9A0J+eZtHV0h559/1hR8z8CmUMQUp4v0nNMau gqyQKGMUMJUM81JnIxepNan4ooGKVG+wMhSJzhMiBi66L660eTylvGOAsX2bnr7p7c9P vvVA== X-Gm-Message-State: AOJu0YwSHXPRNipiHL3q7ibrMO3VHSR0CXZX5Sr1Qdj/Q2V7xVc9H/Hw Nr/BQfDs140P0RqLUy8dKsN6AQxi4nrEuqs2NFo0y812cnCFemIksPA+WL4b4K74rbyKHpiPGZ1 c X-Gm-Gg: ASbGnctVLqfSf9OJp84DSgoT/DiIp8E0h+6RZm3NBtEW5bTxFikBK+B7orvtyl0X02a UAyUvZQrFuH8hV09wJcm7wRQm/EfKtjVBQ3rPZaGPOM3a5gOWdtMHzQc3K14mE2rgQ1aGIJTEKC 0Tf54V3v3aVkUpQgqKe/b4t5vQLxzoSqim2e2/PseSyGOBrDDy+E+Zs87pUZUP3R63aemqdQtUq HEZc9kVKoKwWPTkCeZYlTTeX5rfRd4KDv38feqEH+JTpPz6w46jqii+dRJ/WTJ1gtfKAY/TrGP0 nJsq2+MstA81wnplz8d6och5UGiJUsgoSjRBraRZNL8JMVqDQm8SyJEmfOD1yjoL9mbwQwr92df ihHZ3gi4r3+Cw8f1ZUoM= X-Received: by 2002:a05:6000:4212:b0:39c:1efb:eec9 with SMTP id ffacd0b85a97d-39cb35b8aeamr736945f8f.13.1743724862023; Thu, 03 Apr 2025 17:01:02 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020d63csm3041048f8f.69.2025.04.03.17.01.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 24/39] hw/arm/virt-acpi: Replace arm_feature() -> arm_cpu_has_feature() Date: Fri, 4 Apr 2025 01:58:06 +0200 Message-ID: <20250403235821.9909-25-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 da61af1d359..ae28d958895 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" @@ -697,7 +698,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 Thu Apr 3 23:58:07 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: 878101 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3531033wrs; Thu, 3 Apr 2025 17:02:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWrQ0zNYxULLEFzdpptDzxGT98ySdAN4S6tQ3gW/GxardJBTJGaqSc+fPSPMsUk8NcBbzIOmQ==@linaro.org X-Google-Smtp-Source: AGHT+IHgEMvHr3xWlRojhd9K3bkLlYz7s9lPjfqLYaJEPy0YqmTH29YR8B0w/pjQQOECvxpwO3dS X-Received: by 2002:ac8:7d95:0:b0:476:ae71:eabe with SMTP id d75a77b69052e-47925a777c8mr18024021cf.50.1743724936891; Thu, 03 Apr 2025 17:02:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724936; cv=none; d=google.com; s=arc-20240605; b=YLHzwHmgNsaZzwvsMS4Tjs5+oX4dNdZYBUXO3tjx/wr4iWKjBuejaC0wtqPXYo/TUI ozG8IV6VTaZBxVkbX5xxnbC+FxhLwCx/RG2RmVqqcbp7asGCCxjxcX9AB2bLyuh6KLky bKBUUpaf6cipG6N4TDv5zC794QZw3HV7r099yit0qQBR72AYvL4On+3bdLVisBzAEJ+M PUTwh8NxuPMa8XaaYg/pnFpkUqKbMVz6YzJV0B4HCvq62IYtP9ebXvflKRqzaekL431J XLuxOoBX8NH09s+2EqDHZ3u5tTGEj+mwMykY8c/f1ctJWosIynLNHC3Y+evjG8DtZtSa Erng== 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=xVs2JxQxPMzs6nQ4YF8OYK7Cstm8SjVx58qC1Ep7qgk=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=cjnYOi7rSobLPQgDK6OwqoaM3UjaSaZ1YMtNaY5LisDi3WDJMlPGSqhNATraACSA8+ 4oWHC4dEhbuLIOxrZvrLpICFfRdsgzkJBEyO0hGIjfkcxB5p58Y7Td0TlJ+jKuMYxKLQ LelLFpBolbAZkbm3UvY39v4RjvJdYkIww2oLUUGqPF+RoL4uvsY3Ad3nYSVtJ/sD5Bxo vBig4mwq1kA0KcFwz44I8o4eLMuBrw3RgPq7js/f/fIvIZz4b+yHwT8bA9srkY+HZOYS 0S2Y0VAagbwxDH5BlKGLYtK8nSpRW1nIAFukSRhllN+8lpICe04NGRA/g5RhXOSSi4rQ 7cqA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=igW0dRUq; 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-4791b07c145si21032131cf.199.2025.04.03.17.02.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:02:16 -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=igW0dRUq; 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 1u0UUl-0006BT-R9; Thu, 03 Apr 2025 20:01:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UUh-0005sc-Ll for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:11 -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 1u0UUf-00036S-Uk for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:11 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39bf44be22fso1057437f8f.0 for ; Thu, 03 Apr 2025 17:01:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724868; x=1744329668; 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=xVs2JxQxPMzs6nQ4YF8OYK7Cstm8SjVx58qC1Ep7qgk=; b=igW0dRUql52h67d7kU1FgxNUuBKCaUcoKwyiUbB1c26KWp6DagbN/qMMmqDRnH7Cg4 VFneVHOnMle0G5Yx+8AqSphiUdvqD7EI66vhECvDGdx5HJ5k3dFFOL6ixSKeaTEwVE5y a3Ld2mbka0McvAHlC4rv6p6Gm3xu5NCylCFxOrCWCfcA6dxoS2cRrGu0htXVy4h3V0Ve fXUNdpEhdwKmGbZsgFIplc7qYwb+S8bQzOF6fSdTvlo6ncqvhqtSQO+yAd/NjVqSDbRv 8JwtC2SXliN1jktSIam/9Q7KwpSViGjuGX36sD65Hd5bL9NE5589eL1ssm0YUMTwW7xg xD1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724868; x=1744329668; 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=xVs2JxQxPMzs6nQ4YF8OYK7Cstm8SjVx58qC1Ep7qgk=; b=eqtpqWaM8YSngl5vyJx3kJUjmZMOBfhfFaEhxGcIRH6KwHx6wJxBHrdi7LmHLE+V3O bZJudps8qNh48z2y3tMqbckBb85tC4l1c9pWsmdoap+RYAyauxq+3/6a4Vpmdq25/pPq NctOyXWhcEqgwU8W3ICgJzhm6SpE0fa0GFARQr1SyT8VO65vDNkd+LVCsN3+rsWFrO6u VIvLDIqTq+ckc8uXmked0fWEROuygYKHU4rO9YK4LkeJQPimnN9Bdv8mGnBAmDL4yw8k QC7VahVTqHuDN3+DtnjqwZu5nEGA8feDYE31MgjfhNGKALmhzVeOWefxmSyM+FkJPmd/ 7XWg== X-Gm-Message-State: AOJu0YxY8NsLgaXVHa9d1zXP0+4pJR7zWrUA1PRO2qM91Oosdn1W1HwT NLGiizLnfI1aEcR8zW1TasCaoJvRjMzpDlIsl6mZWL7lFuwraUD4UC8K6dBunNVRK4oYrfiLaNd t X-Gm-Gg: ASbGnctqrguHOTFjf9P8J9HaK3e32pPljIXrIWF5gwXfVqNq4X92Q9WQUz8AS79vqQY qhm3vaeA0MZbBr0+iK/exF8PZX8Xm5Ts24xWNEgky7of+OZCO60NaChEV5C5y3dCs1xWg77Yqk7 diitIF0xrYmpxkMryu3YHNDi5K5505DkyzVtNd3m0bCTVBXfI/poLaHKOzVBtHQp39FGoyPqEgC qyb9/I9dYgfmhOwsnmz5zPKPbcU+QbqJp7s1YdRK6FbY+prcNgFGPBAVLwNx7RxP+PFJ9+MOPHO IjEjp3YwwWVHctFLrW7fj08m63KtMXgTk1c/HzE91E4V53ApesbTeJKyZVG5KgZWlYSDfocijj6 m8kTxEdrV/nxD2Ncf1ns= X-Received: by 2002:a05:6000:4312:b0:39c:1f02:449f with SMTP id ffacd0b85a97d-39cb35b2550mr929765f8f.2.1743724868206; Thu, 03 Apr 2025 17:01:08 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c302269a2sm3006627f8f.91.2025.04.03.17.01.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 25/39] hw/arm: Build virt-acpi-build.c once Date: Fri, 4 Apr 2025 01:58:07 +0200 Message-ID: <20250403235821.9909-26-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 Previous commits removed the target-specificities, we can now move virt-acpi-build.c to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index f52034ff6a2..536e3c369c5 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,7 +1,7 @@ arm_ss = ss.source_set() arm_common_ss = ss.source_set() arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) -arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) +arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_common_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) arm_common_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) arm_common_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) From patchwork Thu Apr 3 23:58:08 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: 878089 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530626wrs; Thu, 3 Apr 2025 17:01:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWWxUA55ij8kTBayavEWL5JjoZ6CtItVwAukjpMyAQX39jFTljGToJekyexIg3cEn0Qf/KTAQ==@linaro.org X-Google-Smtp-Source: AGHT+IHRZIbCpXZ3XknO5Z7yEZjjbGmi397I7JQhqmja+DXNSm1YqCA0wXGFw4LzGSaZyKfrRm5d X-Received: by 2002:ac8:7f88:0:b0:477:6f1e:f477 with SMTP id d75a77b69052e-47924913001mr24398871cf.19.1743724892157; Thu, 03 Apr 2025 17:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724892; cv=none; d=google.com; s=arc-20240605; b=fMdWUvSoTd45Zmgk60kY2P3i6kHOQKS8bb4wXPPURNl7SH+LNoaXlTf6pHIqtWW52F RbcOUp/eDgDlA0OVnF6+EbxGKHnbzt1KYL1ezZaKPzkc3iqJPgGekWg52F9A1K22xTjy TkR9F8TMRVli/gwuQh/ApIHAMUISGFTIsRenSWR7NtV0TFBUGuxvrVLA7ZqLSobNEwGx fKPn3/2wV453lNvpmZ9NwAs+ZBZqwn5QRPc5ZFnxpbG8qtkod+0tX5i93ptTixQWaNdA 1ue+ZP8jC1tL2h3T9q9jLxtORxHOUn6A5MHovHnoADjGoA1xy+ukX70FYeXQA6VPb2Tp TNOQ== 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=HWPNe4+0o3jNGntGTD/pqvwzUx9TsuQYTh/1799akw8=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=gQttJKQyFnPrl2nAlPRx1uiizpMkgDeswYF6jlNcktOw0dHvsphuXCTUBWa7z1/46i aXzbEB7R5BEC5c6WyWV6N98KAg9B03r6UmRGCj2MniezcC19SbjCyLxuIzqNxjGi7/gc y38cVhaCj7QSWCvHt/VzGyefX2Ly+AGcWY/ql/flgxg1V1E19JbZ+wMEjL8b6Z2t6VWz sj7HVHDi22y8UXJAxtyi5nUU+2WGFI4bFLBeFXVqGG7c9qVxgRf9E+sd3YtAO2G/Z5Z/ RwmUF4OD7EOtWuYPDulXMulat+VVoh+R7y4jAVFKsD/fJs/KUse46uF2WH6DqR64dwWq B8XA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c56lhAZg; 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-4791b074e79si20303901cf.136.2025.04.03.17.01.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01:32 -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=c56lhAZg; 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 1u0UUt-0006qJ-TW; Thu, 03 Apr 2025 20:01: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 1u0UUo-0006cc-JR for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:19 -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 1u0UUm-00037M-Hi for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:18 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso10274005e9.1 for ; Thu, 03 Apr 2025 17:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724875; x=1744329675; 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=HWPNe4+0o3jNGntGTD/pqvwzUx9TsuQYTh/1799akw8=; b=c56lhAZg3en+4gKw4ZlKwG/8Sde1uafQTK8QldJwQ0S77QlgYynjspBa8DQQ2sMuCi Z/6qjDUFKo4A8YGkd6ijRvzj6POOxID8HVRIi2zLil9LEVh/MZRMplS0zg64KtBRl6Hi 8lAklcitrWQsBjgpV74GLnpKjnOXhbRYjxGJ7LgwKX3dtkVb9H/xwGQZrrKZ22YFPUxx 4CuEa1dfFXP90AjWMBOF0qEwywnSFGa2FlKMt7H2fUxP+K26QxJQ3nJVmUY3klRllJI9 N9OBkGeTBVo79Uqn5+FjEaT9LQn5h3/9tBuTdMIowKYJbK0RF3/oOqUWqsJ66ov7Vg6B UVDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724875; x=1744329675; 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=HWPNe4+0o3jNGntGTD/pqvwzUx9TsuQYTh/1799akw8=; b=M4/5eNA7Ms3zGMpZ/7hd4qVTnE/eqqvQWI53lomZZNN3UsDJ9WoSZ2bnib7qNyWqvG Zl0Zz1i6U9POlRB4bTwVp3TZxixzAM7Yeu5PLoUBSTOPziI+Kyb+hHPDIcuaIS+mS/E+ 0yAOo6a4jdBq5SnHq4UaafrpT+mUeyIP9p0ohetmdbqCvxrky+VJ7X55dbuaQNYmLxnD scEuVT5g1sec6acCVDxHou5m8bfTnBY6ePESx8zSL+0wQhBXykqpeq7UxsdkPIQ87uWf iS+HyCrGLrUyHqSHQIDSjPPYhFdcglCV8EYPoq7qcpjh6vOrz+grBIakdaFUHN6PsHg2 oVIg== X-Gm-Message-State: AOJu0YwrIEt2fb5nrTR9tCP7bZcJvNobWWymLwVBZ7yx5RPp9VAsQFBX mfkUHHqKvdeAJLARREZ5PpDakSi8hgLVn+aDng2on/LVwgToEG9rcrHM18zFi/VuHz4SsGVxFSQ v X-Gm-Gg: ASbGncu3KuKBIzkxHc0W69j6G+GrSHwGGVEILaTOcaAPTpBcdiMlZfJvObtEzg0V+H9 Phbcyk0sQy3ohnB35QilMb7vnnTsuAaTV1tW/zOLYecp5Rce6QdWVzlCBrGP0Gb1ObIIE4tzavl 9JCvyHQcPOTnjrkfYGcJI28EuxsTOpPwr4BSADdxPyJK09rNQM0FaZ/5BfjzNSANlq4bL3Ki2y9 D2hei6Ya3Mplz60+/hymRJS9Jv3GMRevvH3ERWbW0wbT7FqZCzMY00SN2ZbkjDUT7IurQINUveK ocQZhFIG3qEMlKBEPgeHWrHumVBBWfAUFHUz0BL4k0rLkcMACzxahuaKDro6mVHISbpWQDp/oiw pahwkvjG1wIA2Nj82NLkf2u2kbE7fhA== X-Received: by 2002:a05:600c:4f0e:b0:43c:eeee:b70a with SMTP id 5b1f17b1804b1-43ecf9c3e53mr5270745e9.22.1743724874635; Thu, 03 Apr 2025 17:01:14 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020d943sm3004749f8f.74.2025.04.03.17.01.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 26/39] system/hvf: Avoid including 'cpu.h' Date: Fri, 4 Apr 2025 01:58:08 +0200 Message-ID: <20250403235821.9909-27-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 "system/hvf.h" doesn't need to include a full "cpu.h", only "exec/vaddr.h" and "qemu/queue.h" are required. Signed-off-by: Philippe Mathieu-Daudé --- include/system/hvf.h | 3 ++- include/system/hvf_int.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/system/hvf.h b/include/system/hvf.h index 730f927f034..d50049e1a1a 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -14,10 +14,11 @@ #define HVF_H #include "qemu/accel.h" +#include "qemu/queue.h" +#include "exec/vaddr.h" #include "qom/object.h" #ifdef COMPILING_PER_TARGET -#include "cpu.h" #ifdef CONFIG_HVF extern bool hvf_allowed; diff --git a/include/system/hvf_int.h b/include/system/hvf_int.h index 42ae18433f0..8c8b84012d9 100644 --- a/include/system/hvf_int.h +++ b/include/system/hvf_int.h @@ -11,6 +11,8 @@ #ifndef HVF_INT_H #define HVF_INT_H +#include "qemu/queue.h" + #ifdef __aarch64__ #include typedef hv_vcpu_t hvf_vcpuid; From patchwork Thu Apr 3 23:58:09 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: 878090 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530706wrs; Thu, 3 Apr 2025 17:01:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUo1wa35/QC99ILT65g47BpbmLaAXwrICoQaxhpWDmfHsYMqObisRaXT15E+VQ45Z3BUuqraw==@linaro.org X-Google-Smtp-Source: AGHT+IEKn5+7k4YZdIY3XDnY26Igtk4ta7EtTU5q3UT9kv2/V4t86bfWZo+H7/PKje9jzZC3HVqF X-Received: by 2002:ad4:4eed:0:b0:6e8:ee44:ce9f with SMTP id 6a1803df08f44-6f00df13ecfmr21777526d6.20.1743724899241; Thu, 03 Apr 2025 17:01:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724899; cv=none; d=google.com; s=arc-20240605; b=GmmacgVQKi4br9ZUzM2ptKLYDZuDbd/ikltEjMDw3qe6DIzo8AUKz5r1Hrnri5oxdW GGfRpSH9YOjODpHfXT5un5yEkme8bIL9M3o1S+c0tfPsf2cNemmhQTgsn2q1vYoDaZtS Y5JE3Ftxhg1SWFP3m0Ud1imR5FHLuAX3UJf2dNjxPIsmtT3vdLl+LJOUAjGxns/Q/muk 6EJRR2M4AKHMDvsKlG9q4scWb/EFRdHUIYAPj1W52oX1Sn1NZP9rr991+SlubnhdEbJ3 T6hSVsyMoQncy6cJMVRol8g5FEqMifOSe4fnN/5ft5XEs3xfQDOT6pURGgU4n51Tpzk5 4+gg== 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=aZohGBH8WrXshSWsn5wc6ro/iTiq6n2ZD0DIVPZOhv8=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=i2A3onAi78LszuE+CseHfR1oKviKWGz3R5frBFqbQMMo9GkDaVGOj6TMNfxqp+6prv Wq6BWqmIGXUgaCVGoKR/aIheJz3p400OM2P55O1L2jx7XlRfnYz/mL2aiINHQQxY4H7r GB+AnxLUkcckzBx2TJH6QJvPO3SCiWaaaodrjL6JdKGUTrz2EKW6A4SK9a7U5rZFUYpT s96pAeausK7tj20eBhZOK+b+alX7nAnPLKXviDsk6bfEhPkCsMMEuNrqzFdU45XPnC4Y fuHI7gvX/xC6AYhLILk8nSRapwz6WxJZcTVBLU/grY1rQGMQSnn+2Js2zg1qRrjO03VI 1neQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nruoqF7C; 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-7c76ea586e2si214592785a.295.2025.04.03.17.01.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01:39 -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=nruoqF7C; 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 1u0UUz-0007Ms-N5; Thu, 03 Apr 2025 20:01:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UUv-0006zU-Ju for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:26 -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 1u0UUt-00038W-Io for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:25 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cf3192f3bso14616165e9.1 for ; Thu, 03 Apr 2025 17:01:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724881; x=1744329681; 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=aZohGBH8WrXshSWsn5wc6ro/iTiq6n2ZD0DIVPZOhv8=; b=nruoqF7CZvE8qnJ95Nr1Nzu+obHGlZ32jQ8c8Ze1mFRyRI5EMfiiRatb6wGY6JZzzh 9ns0HJkPV5zKBm6H0y2rTH18IkOO/LPtlQjU9KQsZqMx3C7gpI2aslUlrtVjxGL4STt4 ue3tgFHh1Q5G9t/6NvehaEdLY0NZb6hDm6l43L/tpleAJusspwiGgALBa4xi/neM4BVR Pq5JfPgfo71ZJIs7W5hBdJ1FrASu+7zLeHpVh7REyUe9v2qH4ID+gWdrZ0nHf2ORvMm8 OihCMpI3DRjNuz1lZ6JffdKK3THn00iZkNhM1S6JPKBESljvRYPEvqMa0NDSD7qY9uLr 3lxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724881; x=1744329681; 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=aZohGBH8WrXshSWsn5wc6ro/iTiq6n2ZD0DIVPZOhv8=; b=eOgSRnn7iRRBj8xtfb1QSVZPp/fqgfiF6ygVTCqnSdZNLgSlUTUENyxd41UeV5NrQi DW+mFiuDM24vv38ENXtmohFCJK5KaXfW3KgAjMPqM/lVVMbZTNDZHy3ZUXJlFSBL8IUF iDlELBbAYAKDoiUoJK+iKmVsW71+ESdyBIhNuscuDms5TrpD9UaO8z62RmGEvxMZTend QhMD1+UbSdsB7eV+RiqRYOJLkFxRhl10D2W/QhKYHPq5iGn1SkcH7Yq+iKg6Bshcoy4A jGQVLfVqW4QAjhQX+b5Q3ugF3VgJnRF335dCQiJdlYp731EosEMg+IaESWi28VC6kyL7 hnag== X-Gm-Message-State: AOJu0Yww1c0quTUCS/fQcNG7iWHIn/wyysSsD5I9GdFnhBev5URnZNbJ lh1YM9wOIybudF8hjswZ/VrL85KlF3Bm3JV5zxdGyC/yfdy4Z7VV4vPSM0czEaw7I7gMtUzwqqL H X-Gm-Gg: ASbGnctIuaTxMtg0gdd5ZyH6/bFg2pUnvrSAOfDTQ37HwdH3TaUNjSPQjFhS6Mqlu8q FuPXGL2StK+pbDjpCgB7F2Zj78OmBTqnNJyI0Tgj03C61EOlopVMoI51YeRV9plf4qxwLuCjaQS y1nubWBnsW1MmvHR/mm+YbTk4GoCnokn2e1VYJQ5BOo59cIsFHyX+YSEurvwUU3ANkQfkPTdopg 3ogbRU6ZVfAhBmeVVFUzKJN7iWK3SGTv16iRNLd34Bal3RtIjnFW9n7jpK/u2try8iGDFU9JBdx ggyAkz6ISuQkKIBzzQLyxYkJ8354E2+Nij+ZrS3hiBoRl0enFK4ZBngwXseW5RMKWK4KmNiTKfG 1Do3F6JN+nbGU5YXm618= X-Received: by 2002:a05:6000:2482:b0:39a:c9ed:8657 with SMTP id ffacd0b85a97d-39d0de17e4dmr491822f8f.17.1743724881639; Thu, 03 Apr 2025 17:01:21 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1795081sm34897935e9.27.2025.04.03.17.01.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 27/39] system/hvf: Expose hvf_enabled() to common code Date: Fri, 4 Apr 2025 01:58:09 +0200 Message-ID: <20250403235821.9909-28-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 Currently hvf_enabled() is restricted to target-specific code. By defining CONFIG_HVF_IS_POSSIBLE we allow its use anywhere. Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + include/system/hvf.h | 14 +++++++++----- accel/stubs/hvf-stub.c | 12 ++++++++++++ accel/stubs/meson.build | 1 + 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 accel/stubs/hvf-stub.c diff --git a/MAINTAINERS b/MAINTAINERS index c7083ab1d93..00ef33be0e2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -525,6 +525,7 @@ R: Phil Dennis-Jordan W: https://wiki.qemu.org/Features/HVF S: Maintained F: accel/hvf/ +F: accel/stubs/hvf-stub.c F: include/system/hvf.h F: include/system/hvf_int.h diff --git a/include/system/hvf.h b/include/system/hvf.h index d50049e1a1a..7b45a2e1988 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -19,15 +19,19 @@ #include "qom/object.h" #ifdef COMPILING_PER_TARGET +# ifdef CONFIG_HVF +# define CONFIG_HVF_IS_POSSIBLE +# endif /* !CONFIG_HVF */ +#else +# define CONFIG_HVF_IS_POSSIBLE +#endif /* COMPILING_PER_TARGET */ -#ifdef CONFIG_HVF +#ifdef CONFIG_HVF_IS_POSSIBLE extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) -#else /* !CONFIG_HVF */ +#else /* !CONFIG_HVF_IS_POSSIBLE */ #define hvf_enabled() 0 -#endif /* !CONFIG_HVF */ - -#endif /* COMPILING_PER_TARGET */ +#endif /* !CONFIG_HVF_IS_POSSIBLE */ #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") diff --git a/accel/stubs/hvf-stub.c b/accel/stubs/hvf-stub.c new file mode 100644 index 00000000000..42eadc5ca92 --- /dev/null +++ b/accel/stubs/hvf-stub.c @@ -0,0 +1,12 @@ +/* + * HVF stubs for QEMU + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/hvf.h" + +bool hvf_allowed; diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 91a2d219258..8ca1a4529e2 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -2,5 +2,6 @@ system_stubs_ss = ss.source_set() system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +system_stubs_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c')) specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss) From patchwork Thu Apr 3 23:58: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: 878092 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530739wrs; Thu, 3 Apr 2025 17:01:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULp94iE0XCjIGuT6LwpGDlrfp9AzFIJo37uNgmkw8ppTjNAnG/bknpXZotvAmjevB/HeMukA==@linaro.org X-Google-Smtp-Source: AGHT+IEdzWgq8wwljj3VyniqCxVSGZRl6UbUpwh7r6hdAGWHzg5OfStByL3I8QUvQLsPUwz+KTim X-Received: by 2002:a05:620a:448e:b0:7c5:4f5f:15b7 with SMTP id af79cd13be357-7c775a0fe04mr109641985a.21.1743724903036; Thu, 03 Apr 2025 17:01:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724903; cv=none; d=google.com; s=arc-20240605; b=jW/YrvysrsDHUkVxpLbFLyMX7JGPjv1nQvb6xnvS690MPLe/ddax9wGvpZrKbHF5Qo TxkS5Nuko1xdcPtZ/qEQfBke3BgrScBGJGbtDDkC1286mcQ66Vr3Cg/QPhYc3rnO/QD+ F+DnnWIqSn0/uzKfgjnSy7MF7uCP1WcEDrQa8a/XSJLvmFX130RjHaGP+P5X5ifj6c4U VoWjRjPrMEgTvmZYR5bzvpn7Is6goJUUnT45WzTEFEKY6SIBEgaFJi55/K4GvheYPO4O 0D2MOoBy+RgR+v+/KW2qEr7jPoDidUkgTmmNgIVy1LNPJhI2h5N/aHeMEkPg15MMLxF8 zVUw== 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=SM2BxQyjnLoQLlMglcehWA2bp4eedPWYnDzobwKNiRE=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=D9sRIkdicymt+oDxMAx8lHw4zoBO1FGQvf0S3VRGezuC5b4lwuSudtGey7CzbdWHBV Cow/LHboOmfm+gi4IUBT2OhWUxknWKz4tRsssEtCu9HETomE1WRBRlXWMonbO9tRCVQm c+pPBcJuCV3AFgHWzyWYsX/OGmEJEBuZdF17TplDy4ZjKaHY/8GM+32nXceUwFBSpxt6 n05SCqkh9nOab3LL2mcx12ssGCbTLReUdPa2firYYxkN+YnNXZjpID99hW6ZhWueydly iB/D9FvQc7T+DF0oMaPLSxmhs/qCtfPvmrDilRs7y7c/my+SLN6ZUcWF1C0iKmxrPslj dzkA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JQHcIaYF; 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-7c76eac03ecsi205613585a.542.2025.04.03.17.01.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01: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=JQHcIaYF; 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 1u0UV3-0007oZ-Pa; Thu, 03 Apr 2025 20:01:34 -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 1u0UV1-0007aT-Df for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:31 -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 1u0UUz-00039Q-MK for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:31 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso12660095e9.2 for ; Thu, 03 Apr 2025 17:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724888; x=1744329688; 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=SM2BxQyjnLoQLlMglcehWA2bp4eedPWYnDzobwKNiRE=; b=JQHcIaYF+KMfcgQ9dcBHBz+UOmgPEX602VgjmOqQqcsUwjfFKXeJ3T0NI4cyMNd2fC Z39ollv/mGUKrGTO0V67ipcIEHD23xE8wM1SOskpy+glTN06MBAKRF1Sd3ZBTo9hI37d s7JKrpDDGCo1MHPLRoLLExt5kxZDC14NjNW81XgsBVltRmY9TDI1slnmt4+W9nq4Y/5u 7lXLxu3NjKr4tnSr+14C/fl2rtERvz8kDzjByDVlNwFOGJcCMTI7wLnKzCta2V+gLtI0 WfhvcyFmmEE9ueIdiwwYVpQdi8CHOr7INHg5GistkJSu94vRgMteTKuZ9SogeCYvVn6o 143w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724888; x=1744329688; 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=SM2BxQyjnLoQLlMglcehWA2bp4eedPWYnDzobwKNiRE=; b=VAnC5/eTSKcFxazcPLvKrrukyybw5eozVsEyEAV2mLjzmJqXwgGD3Igf92rgz3SoO+ 6UupC1J5Mq1Gw4bYzvM6N2tWjJk6cA059yjjhL922/X9eBZ5F3a1aLN3uNS88H586zLI m8uFrkGHEytOQi6Qh6J+FA2YpwfpvD2e6ObKVz644raINe/keQbPIksfUIleQxi9qJuH JjwhPAobX/6mQPGv+LE+oD2KDoVqU82bKqnl9r3bZ03M30oOj8sNhP739vo3Nou+8QYg gsnataS3YzTdXXR4D5ot6w2SJIIh7+ETv/eBfHT4cjm/YIo3lhJZxLqWM81c/nZCycFe WYYQ== X-Gm-Message-State: AOJu0Yz3WCKDYGMJlEMfe5kXbRIxrDOLKeidN1wuBrg1XP4Lh91FxlZh wZNGKUkji1kIY2x4jTK7bBBxfJiLC3b7YXRpusQfNj13bImI3IuJgU2HuXgqG2DqI2ZyF+hko6f b X-Gm-Gg: ASbGncvURER5kCbeTAmGCh7q/EjHaibq3kfk/6RooKlZpQV9CwIC/jlnxJrxSLNPYqm +XOp/ooQgnjPbYOGkuDwGYmYDex+MucKluBebCi0R1BwGqgb3Dmy9J4RMA44QLfaNvPD+yOehIE rXEwsUqPub68zDQRuQR/Pt3CyFLB8NBgbuzwy34Zy7sJC4glz/eDjmDg9xm/vI7wDkBuHsJkein hVCr9jSUMpYB1gAvmu5E8sqYC/ItARDO/r34w8d+Bc7Bdlayb2qHgUZp30eEC+2AA/MAK5YntKR 6yoyoIkxdp8k1Xtsm/zHVn7U6Jdq8BLy5OJ9wusmL9Xs/yzgWU5inmt1IJ6GBENnblmq5grFNi7 /OP8Uc/OBJDBB6P0PNp0= X-Received: by 2002:a05:600c:1c02:b0:43d:94:cff0 with SMTP id 5b1f17b1804b1-43ecf90b092mr7223025e9.19.1743724887935; Thu, 03 Apr 2025 17:01:27 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301ba2dfsm2999339f8f.60.2025.04.03.17.01.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 28/39] exec: Do not poison hardware accelerators Date: Fri, 4 Apr 2025 01:58:10 +0200 Message-ID: <20250403235821.9909-29-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 Hardware accelerators depends on the host, not the guest. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/exec/poison.h | 4 ---- scripts/make-config-poison.sh | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/exec/poison.h b/include/exec/poison.h index 00aedc41d82..0574d683f6a 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -62,11 +62,7 @@ #pragma GCC poison CONFIG_SPARC_DIS #pragma GCC poison CONFIG_XTENSA_DIS -#pragma GCC poison CONFIG_HVF #pragma GCC poison CONFIG_LINUX_USER -#pragma GCC poison CONFIG_KVM -#pragma GCC poison CONFIG_WHPX -#pragma GCC poison CONFIG_XEN #ifndef COMPILING_SYSTEM_VS_USER #pragma GCC poison CONFIG_USER_ONLY diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh index 2b36907e239..09d2384745f 100755 --- a/scripts/make-config-poison.sh +++ b/scripts/make-config-poison.sh @@ -8,6 +8,10 @@ fi # but filter out several which are handled manually. exec sed -n \ -e' /CONFIG_TCG/d' \ + -e' /CONFIG_HVF/d' \ + -e' /CONFIG_KVM/d' \ + -e' /CONFIG_WHPX/d' \ + -e' /CONFIG_XEN/d' \ -e '/CONFIG_USER_ONLY/d' \ -e '/CONFIG_SOFTMMU/d' \ -e '/^#define / {' \ From patchwork Thu Apr 3 23:58: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: 878096 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3530881wrs; Thu, 3 Apr 2025 17:01:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVS2zeAA9zGnTxsB4o/+VR8IVyXjnNdiz7Txn2drPS8YIOeFRbehM2uzbMm1n0p8Yuzj1LypQ==@linaro.org X-Google-Smtp-Source: AGHT+IHH5MlS5PJT40c8UDQwxWGzK4YQY260Xn4iT6VWqwM3lnkZ/q+7IjOguCBC0JOMqqIio0Ra X-Received: by 2002:a05:6000:1788:b0:38d:d666:5457 with SMTP id ffacd0b85a97d-39cba982600mr724534f8f.42.1743724919175; Thu, 03 Apr 2025 17:01:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724919; cv=none; d=google.com; s=arc-20240605; b=KoBgZRcAwjDWwH16J4pavhFcQkl5lWQzHYnB1jPYVoT3rPX6w62P/FlahLX3TmmhjS QnIoB1hkC70agl8VcQPYcwIqOS+VxC1qQJu3XwKFs95+CcxOJAq/MJflVZ5jSM1wGYJV EjM8Sb3U/Bw8OoKjLJzbO8yJOdx+lJeXpnK39dZK/sqwI2za1mkcEpNEJSyahvxoIGz2 r2NYOECRMmfWLBDZsxoBgIJRYHeOPYLKPT5K4n+ArDVY79hl0J1qK22wKCrj/hYHpeEi BcVOJubxtlhIlVdi2zbwGkltlXbwEeg3EGsBQPCX9PeSXfdGcCxq063KCpZqPzIrKnIK 1kEw== 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=BhwdbMEEM7I3hfTeozw77ZRbF5uiUck6nvSzS4M2Fao=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=I7IhFDDSW5CMaKsMoZScxCfFdIgLNiz3PxkqD1ngLJHJLgDLQPJ4zJvaMMNp5ksq7g KMulhBpFIJiuihjhtgi0AGisj2u0yecnab8Ym9eh05feVDWk+6OUIC5lwztALKaNt3bN vQO+E1i5jPlEc4HcHml2Q/htrsj1VRlIp7tx6y0rnsVzOmcABc1xnEjeWJi3QmoKjDtB 1yNTwFhRoeloRftJS+5aM57PvFthAWKtmvU43WkI6HBl/Tut0R+HL5600klNAsDYNeZE wHjHqmK2zs7k8Ij7JsNCR1shBBXw9c4bKaJhTvwqHOB5p85LU5IfGwT0xdrtz1POsh0J f52Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NnoEcjkQ; 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 ffacd0b85a97d-39c30248ec2si1679510f8f.615.2025.04.03.17.01.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:01:59 -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=NnoEcjkQ; 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 1u0UVD-0000ig-Ky; Thu, 03 Apr 2025 20:01:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UV8-00005q-Un for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:39 -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 1u0UV7-0003Aa-3b for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:38 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39c1ee0fd43so1248787f8f.0 for ; Thu, 03 Apr 2025 17:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724895; x=1744329695; 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=BhwdbMEEM7I3hfTeozw77ZRbF5uiUck6nvSzS4M2Fao=; b=NnoEcjkQTlkJ7aaOUQ5hY2221M5LF3x2fY4lwIdEBk0biJ6ssOEafHPgOWo6vvX9Ed OsDAwPaaivMFytQm0tNboY8KeI0Ke97suhVKgZ8HugPm3qhZmyRai9/vdzR/uyJFDqWC Lq2LOoSaHof4bi5hYE7gy/TMMwPGCgHmUrNrTUBU8e0vgdsTuS/RAOj2WzJkMJO48rpg xKSg+0zQZwFX/9XvFRciweHzJ9u/GHQA7qgSwvX9RYt7ItY37S/XXbn3w5DzKZs6dKPT 67WWtsG88oBBJNsck/bxultD2Hwvf9VxehhhRuYWc3Mk/qkUpCDJ1TDQG8tTkLzZGHls jS1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724895; x=1744329695; 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=BhwdbMEEM7I3hfTeozw77ZRbF5uiUck6nvSzS4M2Fao=; b=CeZXwaD1ZgcAaAuMITRZzLlOjCPE06LnhbnYDZxySrT10IypVto0EX39lTrlU/B8KY 8Vps3UT9ACOEkYNWh/23BuRoFq3rNJqBdrj0tuvJAnrf/h0AbYZqER4O9me8a7NA4bNw 0EBbZ+YK3OgR1KV+HI3Z1CoZZ6ZWeHggc5iowQattga3AaHi2kkYnv7o4YPwVa23Hyd0 4s0Loqq8Z9U89IoiXAJb51Ed74Jt75UdxxwPVc/julypK2knI/q6ajoacoCoHojt/2O7 z7CQOIV1/Me/e9qaqd1aYcj1JFaQrE4oQg2cXv7aoSSsXe0enVWCZ+Fy+6zNHU3O7xvJ 0nNA== X-Gm-Message-State: AOJu0Yx4KSD901/31GtUj/X9rYMeFIwHWEsoEvqXaopOQPt5uoHko9Do UYdGkQJ9hxUP43wCk7S1Eg13ustweM40fzYTwpBltlQkWGhcLkUr5lG2fuxxKBzwqxFbLDE2Tid n X-Gm-Gg: ASbGncsPaNGWNyVaHZcxc0W5WZT6UEgAMPO33gLHNuXy2pPzypFXSWKDeQlp2SIp9oq jpqfTX9B3E3xW1UtNTiZ1/OaWkUy+3mh9LG4ZwT63KsdH5vEr/eGw9o/0gjLr4FLDnr8C+ZSUsu b5x0svyaDDwENj/DU2f93smSxo/mv9N1XBQvCrgetxi/GZQQvgAgnJiFawqm41XXjHjKFs+Zcy9 QgBr1GC6yRR/fRzG/rI5wPEZ6FihGOWmests5O+S6NWJycRoiLrsldVRVMKCIENvald+E3tGQmr wjg2/7q5BXucBFjXvWZ7RapTLr1cV3ad/IiWlTXlHB9uBnM1nHffRpYLx/LuPM2p1ct7JerAKbb jYKDCJtJLREKcHA7y1t0= X-Received: by 2002:a5d:64ce:0:b0:391:3915:cffb with SMTP id ffacd0b85a97d-39cba9825d3mr820471f8f.43.1743724895250; Thu, 03 Apr 2025 17:01:35 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a7225sm2978752f8f.26.2025.04.03.17.01.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 29/39] hw/arm: Build sbsa-ref.c once Date: Fri, 4 Apr 2025 01:58:11 +0200 Message-ID: <20250403235821.9909-30-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 Since previous commit allowed the use of accelerator definitions in common code, we can now move sbsa-ref.c to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 536e3c369c5..7eb49c7327f 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -14,7 +14,7 @@ arm_common_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_true: files('olimex-stm32 arm_common_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c')) arm_common_ss.add(when: 'CONFIG_NPCM8XX', if_true: files('npcm8xx.c', 'npcm8xx_boards.c')) arm_common_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) -arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) +arm_common_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) arm_common_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) arm_common_ss.add(when: 'CONFIG_STM32VLDISCOVERY', if_true: files('stm32vldiscovery.c')) arm_common_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c')) From patchwork Thu Apr 3 23:58: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: 878102 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3531180wrs; Thu, 3 Apr 2025 17:02:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWrWHtw+vNTynVdYz4ZGXqePn60k0LSe8c5AjLNtR8CbuLzzcMvqw5mxhHy+U3bZlkEfVVD3A==@linaro.org X-Google-Smtp-Source: AGHT+IEYtCatN1HebhqS5rPo/urwm/BVBHGwN0MBjejCndPws2eYXFGGmat1IJGoMmL68GoHT7ls X-Received: by 2002:a5d:5f96:0:b0:39c:cc7:3c62 with SMTP id ffacd0b85a97d-39d147577famr432065f8f.51.1743724955580; Thu, 03 Apr 2025 17:02:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743724955; cv=none; d=google.com; s=arc-20240605; b=NxjgEEfPQzFYqjgACWNbOHE18ZtpCFHsibgRfFiqagqpZGygzsbUN5QhCz31Usi/BI FWM7e0zuvjFY5eYym+rrG6fkRIl/JYuICtAqHTV23k7Z6XQ5bx9C5zPwy/+9/xFC9R1j cOo5O1Ym/yGhLAfsy7DwJ+XsrWE8UkOFk1iafI89DqR88aluSzmClfALQuUihG5Kod8x Q3WTYJp6jgsXJnzkaZ3FjrUkDv3mdVqsxsa0E7wkVIUm+ldm+og5PefyPuAUWJAA31b1 xX/DDRqHQvGUBazKBVeGjS6SUSbbTAl84xkBmWOKVcHcNNHs5Ln2mfGpqeRnOR0BW5na VfWw== 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=dncWdRA4NNhUDNyzQZGGLA4K2lDkI183ST8pz1FTTJM=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=F+nyp/5IFqm0OfDC2JM8aGdUPtCfhfKZTrrtxqElgSYrtxwTF0kZk1/GiHgc1cA/xu Wc0/H8wTK4lCIncJxdtkakQghRMsouGYZHNhrzUwn8/jsVTDjEgthi7165FXglTipl// tosB2WD+ZpDCFiUOvXUS2H0yJOTQG2yGAEGm4TW/YD5SxVahbgS2PgnWX9yySsLHFPHm qfrV7fUssKQrsTdmyg/LhrxNvoH5p222n2TU3bdbrmPkObt6AG4tWwyXg10Ud1QwlZ4r jqeVfnLpvmdA+RrjA9eUEHeAwOHlGeVqIbz2rbxT28bTB+M27IEbICWkndzgcDGGvn/D bW0w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hPhoityb; 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 ffacd0b85a97d-39c3024a210si1746983f8f.666.2025.04.03.17.02.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:02:35 -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=hPhoityb; 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 1u0UVI-0001KH-Kt; Thu, 03 Apr 2025 20:01:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UVE-0000ue-OW for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:44 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UVC-0003Bd-SR for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:44 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3914aba1ce4so1193256f8f.2 for ; Thu, 03 Apr 2025 17:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724901; x=1744329701; 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=dncWdRA4NNhUDNyzQZGGLA4K2lDkI183ST8pz1FTTJM=; b=hPhoitybx1+Ywlu/jIqpDMxhkeUaJyG6W6JSNy/Qo+wODw1syKdZC1+I0e2IM8eUet pnwX10/1Ip2bnUj+09gNxWZemLlEIdskPys3z9BbDXHquHnYIRlD9uRq4bify+nXgGAK QCvgbYOt24sU60z0aHSYQt6wSqzkH3kQDvjGxWbQaLNndUt9A160Nlr+Y19eiZNeYk7G O4EGhJFkRmgs9+NBdM+FkZ6m6C4dkp0h7ZJwp0Wdhv3nffL4i/qdsUiH8vhI1dUqrJbX uNvUjGQRYHCxhEZLr8uvy58dhlc00WMnb4uHOinxmimpb1GAK1v+kRfJcJT7RxLYaMZ0 iyMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724901; x=1744329701; 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=dncWdRA4NNhUDNyzQZGGLA4K2lDkI183ST8pz1FTTJM=; b=VZfrenaD5J2zsr32j6YN9qzlMFMGavetgDicB62/OvWhfMC4yoDiinVLzzX1FQiLzf 65kLvDXa43gvqghd4MlC0VZgJ/QUN3z6VZx8BE+CB5lsIUEJfRc3KaCGWszNYaI9AAhi gfPwyWoIV99ixf4TGL8vgjSW5dbCSdda+Xz1pmOVEk8iUqDZVkXBUtAs0pNope8IBOer IxJbQg1ZjAUQAxr4i6zTcnaJiAeXZeZNX0gteS2NFAZbH9K8HaceqTdp1jJ0cLuiwO5B qByRmMs/79W5GaoIhtlNj9grPNC3IMzb0NkI1g1FkhI2hukA9wau2R/cR33l8LVr/MKN I00w== X-Gm-Message-State: AOJu0Yw42fsnNxy1O9JLr6oEpNGZ3GWKk66bi1k44ppfO5xd+4Jgzo73 cGZKQ+D9zWKAcunobo08U6QT3XgCh/WkZXVmMt/B+RZ9Dnjm2yHKe644lTmDC3OuhxT7w+Ve5GV k X-Gm-Gg: ASbGnct+roI2IXNN1h1k9oDuY7WBzE5cECdRPtbn9T2Z1kH/5G4Zyh+FuvG8UdM6hKC 9puppzLEeixIDiCE5l+kcCJWQ2BHWaX0Z8lF3xurnGl/Gxorp7FrsugcikABmPufn07fV15uz9v tj9giIUt9hT0ZLZGMumIVk1/Qw1RMfaghtLyyN787K979YrlwHsMCv005LzyJhY8JCkuEqQhK67 /SB9Sia3GG9gavwXnr0+BGUNTXp+gsY4ygTaAXDijiLbwbTfxBtvl87tRgyBt5qYio95DvxhqLS BA37g1PIAvFAXWRDDvCH1L0odR/EHkk78ZGRQgzeyhqlhQaJRNrn2ny+8GP4y23fPUbi3gWn8v9 8QMG76tzHLHWv9fWtjKU= X-Received: by 2002:a05:6000:178a:b0:391:43cb:43e3 with SMTP id ffacd0b85a97d-39d0de67a65mr328125f8f.46.1743724900715; Thu, 03 Apr 2025 17:01:40 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c30096401sm2982309f8f.1.2025.04.03.17.01.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 30/39] target/arm: Replace target_ulong -> hwaddr in ARMMMUFaultInfo Date: Fri, 4 Apr 2025 01:58:12 +0200 Message-ID: <20250403235821.9909-31-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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é --- target/arm/internals.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 01408e40a34..d6ac00be0f2 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -25,6 +25,7 @@ #ifndef TARGET_ARM_INTERNALS_H #define TARGET_ARM_INTERNALS_H +#include "exec/hwaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h" @@ -726,8 +727,8 @@ typedef struct ARMMMUFaultInfo ARMMMUFaultInfo; struct ARMMMUFaultInfo { ARMFaultType type; ARMGPCF gpcf; - target_ulong s2addr; - target_ulong paddr; + hwaddr s2addr; + hwaddr paddr; ARMSecuritySpace paddr_space; int level; int domain; From patchwork Thu Apr 3 23:58: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: 878130 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3532020wrs; Thu, 3 Apr 2025 17:04:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWn2awSG06Iah0F8k/ILjbQCSxJeKD8dH/Bh/kjIPLKVikEkNN9gQTIZymvLaWZabjR2Ww+pA==@linaro.org X-Google-Smtp-Source: AGHT+IFdeoinJHjxPbzblxsh3Nh6FkapzFHA9qRbpGDWeJKwK+Pa/fvjFW7cfZnNP+Yjz0Tniaw8 X-Received: by 2002:a05:6214:1d26:b0:6eb:28e4:8519 with SMTP id 6a1803df08f44-6f00dfa929emr16701426d6.21.1743725063700; Thu, 03 Apr 2025 17:04:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725063; cv=none; d=google.com; s=arc-20240605; b=edsJHRF6yU5lqtLTCu/F98o4+9gE9ElWGZiujTpLlcSeMjIOeCZkX4SgWXhCBGhDAo 9Xtjg0bzbVnzlqowI9lKGOzMHDOVn4N9H0TwR5wFJwUbCgkjHcL6Q95sYTZtN1AfY0op NFvk3JQBFRq5D3/85GpYyxwZ2FjsFQWx3jjoVkMkSvLseJNlvXqrSy8R9QRw8qOjVhwI UPeRMVm3S/1uwBnAfaqOGssT2a6uGyPqSNqfQavRPAHcQNd4NvLbVyX5lSvNp/FQqAZt 2LIx9ctBbzLKbvfU19VqFWsWe5UkNxcpiBW5LOsN1GiVNcmvfU5MlmHE0pPTM7x3jaUy idnQ== 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=yvplpfWyToxlMcaiW33GsKxUhgmpqpXgGdwTbAzyNHc=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=NWGd8vAmSle3JZ/fSdQlrRqRr8XNlGNKUwXU7z1Y5aMhKpFUuZosvRLFex8rERbldv jtlhcpWYXMk95UEjWV7v3F6FS+n2rdt/VLR85mtrk5tD5RgD10XjyHKoy4h/pjrqTIWu VbpWRjis5d/fqoVLak3wmeI000iFttwdlzeoANGbGguzuAY9dmHU3BCfNIEIPZTyXwLn 316VoloM1x/ooQ9hjLBwHCuKchW9NmuFLuIaVUeLvm/sT7cRZ68cPPgmzP5UKJD9oeEE 4m5ixmQESlW9A6d5LafVO/hoUJpn9sSq42yEqC/+8AqDDiYqdbn0y2cS47BX1ZXa5W5N c0lg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="CYu/BATg"; 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-6ef0f12ad07si20961126d6.340.2025.04.03.17.04.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:04:23 -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="CYu/BATg"; 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 1u0UVi-0001sQ-Qf; Thu, 03 Apr 2025 20:02: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 1u0UVK-0001ZI-PH for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:53 -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 1u0UVI-0003D7-TI for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:50 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-38f2f391864so802387f8f.3 for ; Thu, 03 Apr 2025 17:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724907; x=1744329707; 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=yvplpfWyToxlMcaiW33GsKxUhgmpqpXgGdwTbAzyNHc=; b=CYu/BATgayAuDYYofooAUO/EDTXW70J8TG0onXheXvTsPv5lX8/mAnmXcoBeh1Whby cA+xLDrJI0O/HwAYAgdNwEiNobq7ihPkKJnDQnmD9W65xVPRwyVIE6vpZkn3W0ZvvlRL Ly+3sn2drS22gqlkb21Fk2Uv7bA0KXouy8smb3J/8JKyFCznv5D/EnIAmSdVYf86B72h du8r0KLNU/VtCWUkiX7Yj10mKpOvAF6Ju4amkH892JEk8kou0s7Sqj9iNVdkKiyiUAIR BeIDaCJUh23epr5FO0XKU8Xd2ozRkqZN+acWzABoFUnXaa1KNDVwtYdBz8wZckQ1ovs6 cARA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724907; x=1744329707; 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=yvplpfWyToxlMcaiW33GsKxUhgmpqpXgGdwTbAzyNHc=; b=WpTtX5vhcSt9MADYiH4nOrc7P/ES+oN/TWQtN6UcsMvBl1LlgpdmQYre9MqtLuPuPH /drtrMX6xHB0laM2J3ZbQtqG02EJ0VLr7S4nTfbrbrDkx8kIbJAm+IqqqiVxf9blFij/ m0Pp5Sv1o9FH6PWCZKxKNEl6zY20go8MHbxhrve48fwvq8XmJFOMHeG3/pw8t0mUSlAh Nur81AQSrsWqE64eEYAB5yQKmCbKIkjm4sH5Ng0RlPwCFEXpFMUJQBeSUraPdG0JQaZB aw/URhqWz9FvvJ+vxi4ZDj5vq/BElpIF1s8g47XcRvNn8qPgLynUhB1jVwYQN2IrF/Xy b+Mg== X-Gm-Message-State: AOJu0Yw32Oc5z8T1mjfAurpqarWwIvyqco24R9aU1IbT/rxP2AIWe6jd fMRJa1QK2JRE/8zFTYJTsavwAbcxnuEKieFS+cIAXgSFGGTE7PIQwO1n0bfwxZVCmoLE/fR+map M X-Gm-Gg: ASbGncvcjQzt0dBQHFxEJcCIOgesQyLpHhtZOqBI1h58IyhdYvEct65rrwwmHt5wBx+ /agi6AC0yfHAOs6r4BfvLjLapWHrB4/+JFCusrmxE2hLVXInBZGENkyR81CBSEdrR2kHm+rv/y5 zIpHeZTuSJbgDNrfI0hGY+5bkq8zPtZZDnCDhNzjCu67U/XXfv3t79+CzIaZO1bySL20pGttt+5 VFRDjLh3VAT1JwsLEtX2n78seg5vzB+ZrySaR/Jk2oMcorYSQHsLVelsKoWKKZybf8BaKyCyS3l FAdkXAHZHTKhjB6MbJUad5uvlJr9WBt0K3JoTeh5/m93y1/33uPkd6IASq24vrKO3H/LUVbrlvb DFRy+Z68yzwdNO+KVvgjBpCse+UBrEA== X-Received: by 2002:a5d:5f94:0:b0:390:fb37:1bd with SMTP id ffacd0b85a97d-39d0de61c04mr466263f8f.46.1743724907054; Thu, 03 Apr 2025 17:01:47 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020da22sm3029543f8f.68.2025.04.03.17.01.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 31/39] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint Date: Fri, 4 Apr 2025 01:58:13 +0200 Message-ID: <20250403235821.9909-32-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 CPUARMState::pc is of type uint64_t. Signed-off-by: Philippe Mathieu-Daudé --- target/arm/internals.h | 6 +++--- target/arm/hyp_gdbstub.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index d6ac00be0f2..ce60aee41d8 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1944,9 +1944,9 @@ extern GArray *hw_breakpoints, *hw_watchpoints; #define get_hw_bp(i) (&g_array_index(hw_breakpoints, HWBreakpoint, i)) #define get_hw_wp(i) (&g_array_index(hw_watchpoints, HWWatchpoint, i)) -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc); -int insert_hw_breakpoint(target_ulong pc); -int delete_hw_breakpoint(target_ulong pc); +bool find_hw_breakpoint(CPUState *cpu, uint64_t pc); +int insert_hw_breakpoint(uint64_t pc); +int delete_hw_breakpoint(uint64_t pc); bool check_watchpoint_in_range(int i, target_ulong addr); CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr); diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index 1e861263b3d..4e52d37ed80 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -54,7 +54,7 @@ GArray *hw_breakpoints, *hw_watchpoints; * here so future PC comparisons will work properly. */ -int insert_hw_breakpoint(target_ulong addr) +int insert_hw_breakpoint(uint64_t addr) { HWBreakpoint brk = { .bcr = 0x1, /* BCR E=1, enable */ @@ -80,7 +80,7 @@ int insert_hw_breakpoint(target_ulong addr) * Delete a breakpoint and shuffle any above down */ -int delete_hw_breakpoint(target_ulong pc) +int delete_hw_breakpoint(uint64_t pc) { int i; for (i = 0; i < hw_breakpoints->len; i++) { @@ -226,7 +226,7 @@ int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type) return -ENOENT; } -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc) +bool find_hw_breakpoint(CPUState *cpu, uint64_t pc) { int i; From patchwork Thu Apr 3 23:58: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: 878125 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3532014wrs; Thu, 3 Apr 2025 17:04:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhzFiQQuu+RSotQJW0DDXcKqgxJuCYB5Pw6Bkg9zmD92F7kJOFSsVUNBVdNncaaRyY43RXjw==@linaro.org X-Google-Smtp-Source: AGHT+IFvwA0qFyRmgjzXdtNixeqUKbhkEZ5odfaF3666kl4ctTv9B4sQWBwIWQiZCYa5ATCzPFkY X-Received: by 2002:ac8:7d83:0:b0:476:6a3d:de2e with SMTP id d75a77b69052e-4792491a793mr22869151cf.14.1743725062701; Thu, 03 Apr 2025 17:04:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725062; cv=none; d=google.com; s=arc-20240605; b=eq8t8LBSsF020iKhLO+WhdYIUnKJyIGAQ0sL+Iizbf28PHeu9tychWBu0YMugACnw9 osAl8u1D9PIETzZWE6VMwcVBS+RG1jnib70fWrj9JBXBN5vB+ECxMrOz2K60EhYHXbCv tmY6RqGg+icJXC500CZRHktlcljdb3JA3dLYNblKDFU2v1Fzh4cKAYM2W2LXKCXQoNYl I0CA1fSwes2V9+ntp6Vs3IaNsTD/oIS8tD3EJFwQGRF/64h/84YYFb2DJkMLKOqaFDAU okN4gHhpKn2lJ7NvGXBtZjGfA3ODzgELWCGnkGgtLv5pgbHprRjRgKn/6aT3Qks/Qh80 lcEA== 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=VlQYulyRFs+KcJzdqcrZEMpQxfGXO+wcW4ZSqu04L5k=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=GLdGobL2Hh7hWMy486R8sikCX2BYi+lJLl8mzgbcKNkX/mlWHbjqGWoHGGSchVSdQO t8M3cFr4UeiC4Jv6vJG4voAw1dRLao3G6YS2oSCNGMgrztK3bjiTYuR5UBRT73TKCueC vTCOrei8uKZkOGS5FiuOq/YtRLIBkkxc+VSDzHdUbXjoomhpQF8sYutBU/EBSaR5VIU1 IuRuVUehdbk/xNf9na5PbB5EqP7+E86h6Fg+KypvIHBTasXIkdQ5v/LXi42kpJuq7NIt SWn+TKTcj9uznp1ZrRY3vOSWhlC+A5iDwzDefBYviAhIAAB/V9w1xuuYwAAyJ2cqN2oi qwLg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hQyFGS7y; 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-4791b073f06si20653761cf.157.2025.04.03.17.04.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:04: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=hQyFGS7y; 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 1u0UVq-0002Kk-Kh; Thu, 03 Apr 2025 20:02: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 1u0UVS-0001oD-8c for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:04 -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 1u0UVQ-0003Ex-FW for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:01:57 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so14510635e9.3 for ; Thu, 03 Apr 2025 17:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724914; x=1744329714; 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=VlQYulyRFs+KcJzdqcrZEMpQxfGXO+wcW4ZSqu04L5k=; b=hQyFGS7ymuJsBu00R+0e+vrquuhWJ7oTeOi6+1geNOqiZ+nfd0YcpMSfgPgn/IxmML OKyyePPaUm5PpkgGIF97Zc2WWZKkSnGiMiS7KuLu7J5E8EW8HwcI/0F2hc9cDW0clyK+ 5pZFIXZ3Ljn1pjNwOc56cwFzp4MNFMFfOqAe4slubkLw3mWP0p6vjLFzEETWGQS2kjCm l8ObZ44HDrVTcUa5fnbTU5h4GDzzBnN6ykiUBRYHcOSobaL9nf/Qm3PQ+O47TuU6h8VU +SVz9vNQ4k4O45PMwpFrBAS0BlgzWDl6uUgaI4XsGe/5Bx77iFXxV+xKvlTtSXRmJQI2 kjyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724914; x=1744329714; 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=VlQYulyRFs+KcJzdqcrZEMpQxfGXO+wcW4ZSqu04L5k=; b=JwXlyHO9Kc3eX4MMjmiOw3QSMYpxtEwCVJspSsqxMQnvoy2GUdo4/TEpHAD4epZr2H P3sC0p+GsrNtceLXhk6c7lCNne7nZrIhXLjROt3hY4X3+kB8vPywV/qXoIYIWq33iLKZ /zaLYEE5Ka9g+LRH68Z3mKlJv+iOYz1yhEgkXg6B6R1ZHjrAAv8inJDOyaoZM4I3zpxU mOj+OYikpTTz34c0i2B9CEgvIG/ZPr6U0AtnRZvAyfp3jz7LKSVoiFj0Arq/aiJAiroR KOpsY1ShivodShiudGQst6O4HeWuYmttF5fsHwWfGCwhCRM0GfSH3BIW4J5CPq6cGKCC tbGA== X-Gm-Message-State: AOJu0YxR3D/rW3a0+vxX+RCG+tqGyT/1l4iNJ9KwqLEvaZHHWk3wUxew UTSIGZjuq41QXzZZ8Lj5K5qs6Ojospqox0jHjMVsZXxhBkSeoHDdz2fO0jhkpGDE4oQNoWhq95B B X-Gm-Gg: ASbGncsLV5eqZL1SG5Uw4Xg8VUAf89rPsi4ZCOoVbLt6hIQw/wf1Ci8+N4NCIj5sdZk rb8CAemn1byycZf2raIMpH8zzxt5W5onMgvzU19mNrJ9irkDxQ5XKs6er6ymqTDxz2S9EDd9Zpe GOd5CIfNs3r0Ec+2B2Nk6MetmqxX6By19wRwl2kqfx2ZvfKkc/UBWyALU2uSvqWn1cuNsJK9zno B0/Dthkj5/okLj/y34Qr7XNTu//s0PmgIbld/sCXniohX52ds5e/fL3KamZqfReTnt6cxXHjeaO mFfbU9AWt+mqxYVb58pfeanJ+jEXe2DUMbN+3Ta4MtXiRpgf4wGwhkxduZii/1Bip4hv1PCV4L3 LufvjhXDrAQz0tqdwvlw= X-Received: by 2002:a05:600c:3d94:b0:43c:fceb:91f with SMTP id 5b1f17b1804b1-43ed0bc8d58mr5501025e9.11.1743724914582; Thu, 03 Apr 2025 17:01:54 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec16602bbsm34181125e9.9.2025.04.03.17.01.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:01:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 32/39] target/arm: Replace target_ulong -> vaddr for CPUWatchpoint Date: Fri, 4 Apr 2025 01:58:14 +0200 Message-ID: <20250403235821.9909-33-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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 CPUWatchpoint::vaddr/len are of type vaddr. Signed-off-by: Philippe Mathieu-Daudé --- target/arm/internals.h | 9 +++++---- target/arm/hyp_gdbstub.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index ce60aee41d8..86577207b85 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -26,6 +26,7 @@ #define TARGET_ARM_INTERNALS_H #include "exec/hwaddr.h" +#include "exec/vaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h" @@ -1948,10 +1949,10 @@ bool find_hw_breakpoint(CPUState *cpu, uint64_t pc); int insert_hw_breakpoint(uint64_t pc); int delete_hw_breakpoint(uint64_t pc); -bool check_watchpoint_in_range(int i, target_ulong addr); -CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr); -int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type); -int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type); +bool check_watchpoint_in_range(int i, vaddr addr); +CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr); +int insert_hw_watchpoint(vaddr addr, vaddr len, int type); +int delete_hw_watchpoint(vaddr addr, vaddr len, int type); /* Return the current value of the system counter in ticks */ uint64_t gt_get_countervalue(CPUARMState *env); diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index 4e52d37ed80..4d8fd933868 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -125,7 +125,7 @@ int delete_hw_breakpoint(uint64_t pc) * need to ensure you mask the address as required and set BAS=0xff */ -int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type) +int insert_hw_watchpoint(vaddr addr, vaddr len, int type) { HWWatchpoint wp = { .wcr = R_DBGWCR_E_MASK, /* E=1, enable */ @@ -182,7 +182,7 @@ int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type) return 0; } -bool check_watchpoint_in_range(int i, target_ulong addr) +bool check_watchpoint_in_range(int i, vaddr addr) { HWWatchpoint *wp = get_hw_wp(i); uint64_t addr_top, addr_bottom = wp->wvr; @@ -214,7 +214,7 @@ bool check_watchpoint_in_range(int i, target_ulong addr) * Delete a breakpoint and shuffle any above down */ -int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type) +int delete_hw_watchpoint(vaddr addr, vaddr len, int type) { int i; for (i = 0; i < cur_hw_wps; i++) { @@ -239,7 +239,7 @@ bool find_hw_breakpoint(CPUState *cpu, uint64_t pc) return false; } -CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr) +CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr) { int i; From patchwork Thu Apr 3 23:58: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: 878136 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3532587wrs; Thu, 3 Apr 2025 17:05:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX68MwDomV+pwBsTOWIDOW2GAqnK5lJc0BYvklv9fsP+55vicg2FQYZRnH2/PrbY0+cgcFq/Q==@linaro.org X-Google-Smtp-Source: AGHT+IGhtWuZfYURm9rUW1/j3VWVtK3Hm3PbSwnMpibWLRFe2fKbqzikI+l23kbtjS1Yax9jcGMc X-Received: by 2002:a05:620a:4089:b0:7c5:5768:40ac with SMTP id af79cd13be357-7c774d4bb03mr160164385a.30.1743725140113; Thu, 03 Apr 2025 17:05:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725140; cv=none; d=google.com; s=arc-20240605; b=IGeo3vRwDo5kOw9heTceIZKO37cZsYkxueMBefkG+GVDZtI/zwbXJaNcO5Hkp3hPWG z+LPQlzZph8wJHuFTQnPoL1Dn8QRs4uD8o31zoYpcHbxVIjTiV41hVZxrpvlWMNfLgHC VG3xxiqMr75PR0QwMY0sUTp3I9vkfPFzzkaVzoMUDdRQ7L9igmcpta9jCEFn+rxXOrcB S2aRszWbwqqA6Qg/zaPVl0KDM1t7kwnAaNoIwYCue0wlkfYs7RedZ/W84Wd9UDFiOveP 8bRW5y0VWqj2xIQrGxel3Anas2dq6nyv2nbB8RhB3aNLmjJEB3yINPZ05oKAlZC3Fo2w oEww== 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=pEQ4caRuUm17bqEdIOfMLiQw9DDP+11LU+Cj2r4W6Vc=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=lgpfJz/HyQ/mb0Qmqo6YgOt0NQIvzaj+Slfr8h7+n97wjg1yESnAYKM3ltj2QPSAaa 0rwSCRHP3ff7Uy6JGAaxyRH5c10oPggw3773hlbZzuzWT367L7+2NBy17fKsV9ftHFm0 ts1jFPjrsiHO9vw71dzZhgitKf89UhVwgUdeEQDSfhgYYNt2EsLGt2weEfV1Zt3cze6R OD0rNOQX+gU2YEwBXNEPAHf917Qh09df1P6sf1W+Wb3R9foazdrkF6HW+mIZaSPHTub4 8XgSXWobgVC/iQXiz+d6jwrJtYpAfEoAtHyKhr5FcXXQVD/K/VNOv38IB/M1fsTEZNqn XySg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DiDhqPnU; 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-4791b05e607si21286841cf.13.2025.04.03.17.05.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:05:40 -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=DiDhqPnU; 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 1u0UVq-0002S7-Kb; Thu, 03 Apr 2025 20:02: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 1u0UVd-0001sT-4q for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:13 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UVX-0003GA-Bb for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:06 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-39c0e0bc733so1226243f8f.1 for ; Thu, 03 Apr 2025 17:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724920; x=1744329720; 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=pEQ4caRuUm17bqEdIOfMLiQw9DDP+11LU+Cj2r4W6Vc=; b=DiDhqPnUaC4SRbYNlQmpQg9VqleterL4nzs2cFNnINdG9TROxwQguuoQFsFnL7DFOi +5Bs1Hw7JhhBhXXoOdIeJjgitntj/SRkDLJAqJUL6AEu+txd5tZtjpjOtkqfPhhQNf1j GrCUHnue/X4Df67wMjoAtlJL4pQL9DNPTPglBfbfO2xYfhE2+uTszB1rsOVX6g0JUwa5 Gw4Zx0j4TcxSj5sh5VoLcA8OoB6GOu2p/PILA+uVfIAN+0wSgXfAmvlAQgyi5vh9Fq4Q 4WZXMPSrutGrJpa/GTKbZSeM04yUllTKuVUHWZ6qxLDzJ4I4L/77O2jWK7bgeIm3YTjX PpGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724920; x=1744329720; 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=pEQ4caRuUm17bqEdIOfMLiQw9DDP+11LU+Cj2r4W6Vc=; b=QQD/0QgDuMJNvBhNpCWPYaD0l2RR2GIuTn1rSenvm+mqoh8uDkpqrhuYy3HUBr2T55 3qAfxlUhWNLMtvgMkGS7Bz3xmHS77rS8JyZTpfxh7jUi3J8nOnarDJW/19qFbMXfExwU bZ9RzMKxAohiGPTk289lif6Z7vu0oapInsKvaH5BeYuccCJ1FzaPdyLy0vlfbFCAk8bR fgCloUzVq8RiszqDqoelOViVOafnfenugRb++El6uLacbD+ZqTP1rl2CsAaw7fi8plYs mQRid6xkIzKYhpwQIn+Vg3//if1GJW0F0WHNvzenRDBB96V2n62C4xHFKeOC11aRNFUS EBaw== X-Gm-Message-State: AOJu0YwCI9LSixap2QBHrCnDC5aLl2j/LM6S/nM7yLGPtUbCkl48DK7w a2e2ovopiWxtJHemFJc+hm+a2H1vexyXKVi9Cxf6+BYVg83OwP81uoJQo+WovtXHKTeHr7dZQEV J X-Gm-Gg: ASbGncuK2XW+oWZynYlxeGCGA2FyLmcNeTV07NGpICy0azbJenpXiBCXpUlPoQIyb4x zxH7rBgLWq6ezj57SjYsXdm/BVOIT9CZ7yzJh1BrjBke5RnZSbySUbk1vq+YyAimXG3efuD2+n9 cDbJoBH+WG+doUH286RoXlwYUKPdKfa2muENSAHAUNoUPQSAm8m1n1xVnXzg8y/dlqd6KxE8AH8 yIfJuN3U3vUv6diqqwmsmG/ZByFdSHU9zChOL65ajhwXLF7LPXp+zVM6loUUFp4XM08/1Z6VhUm RqCNhGdY3zBjINYa/Als7BDMLZNwMPrIeCNSEL4XyMh1FBuPuIxmulQU6GU2rlDF6ilJdoEs5bt gjY/vePsZkYPlyhYGJq4= X-Received: by 2002:a05:6000:1ac5:b0:390:de33:b0ef with SMTP id ffacd0b85a97d-39cba93c429mr785050f8f.30.1743724920555; Thu, 03 Apr 2025 17:02:00 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec163107csm35041975e9.3.2025.04.03.17.01.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:02:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 33/39] hw/core/machine: Allow dynamic registration of valid CPU types Date: Fri, 4 Apr 2025 01:58:15 +0200 Message-ID: <20250403235821.9909-34-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 Add MachineClass::valid_cpu_types_list, a dynamic list of strings. CPU types can be registered with machine_class_add_valid_cpu_type(). Suggested-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé --- include/hw/boards.h | 8 ++++++++ hw/core/machine.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/hw/boards.h b/include/hw/boards.h index b1bbf3c34d4..92a13b0dc32 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -57,6 +57,13 @@ void machine_set_cache_topo_level(MachineState *ms, CacheLevelAndType cache, bool machine_check_smp_cache(const MachineState *ms, Error **errp); void machine_memory_devices_init(MachineState *ms, hwaddr base, uint64_t size); +/** + * machine_class_add_valid_cpu_type: Add type to list of valid CPUs + * @mc: Machine class + * @type: CPU type to allow (should be a subtype of TYPE_CPU) + */ +void machine_class_add_valid_cpu_type(MachineClass *mc, const char *type); + /** * machine_class_allow_dynamic_sysbus_dev: Add type to list of valid devices * @mc: Machine class @@ -307,6 +314,7 @@ struct MachineClass { bool ignore_memory_transaction_failures; int numa_mem_align_shift; const char * const *valid_cpu_types; + strList *valid_cpu_types_list; strList *allowed_dynamic_sysbus_devices; bool auto_enable_numa_with_memhp; bool auto_enable_numa_with_memdev; diff --git a/hw/core/machine.c b/hw/core/machine.c index f52a4f2273b..5993c6e38d5 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1538,6 +1538,11 @@ const char *machine_class_default_cpu_type(MachineClass *mc) return mc->default_cpu_type; } +void machine_class_add_valid_cpu_type(MachineClass *mc, const char *type) +{ + QAPI_LIST_PREPEND(mc->valid_cpu_types_list, g_strdup(type)); +} + static bool is_cpu_type_supported(const MachineState *machine, Error **errp) { MachineClass *mc = MACHINE_GET_CLASS(machine); @@ -1581,6 +1586,29 @@ static bool is_cpu_type_supported(const MachineState *machine, Error **errp) return false; } } + if (mc->valid_cpu_types_list) { + bool valid = false; + unsigned count = 0; + strList *wl; + + for (wl = mc->valid_cpu_types_list; !valid && wl; wl = wl->next) { + valid |= !!object_class_dynamic_cast(oc, wl->value); + count++; + } + + if (!valid) { + g_autofree char *requested = cpu_model_from_type(machine->cpu_type); + error_setg(errp, "Invalid CPU model: %s", requested); + error_append_hint(errp, "The valid models are: "); + for (wl = mc->valid_cpu_types_list; wl; wl = wl->next) { + g_autofree char *model = cpu_model_from_type(wl->value); + error_append_hint(errp, "%s%s", model, --count ? ", " : ""); + } + error_append_hint(errp, "\n"); + + return false; + } + } /* Check if CPU type is deprecated and warn if so */ cc = CPU_CLASS(oc); From patchwork Thu Apr 3 23:58: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: 878122 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3531904wrs; Thu, 3 Apr 2025 17:04:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxYMauEdGlVmP4L6xdOEBnc9vW7tIqlZ0uoihPCdVsmeE/Gpi6ugB1/WDcY+ddsCAoiGCFdw==@linaro.org X-Google-Smtp-Source: AGHT+IFwNCpjNkP4sqFQ5c5N826UKTqzfydL5f6V6XSswS/HCTTYxMznbt8dMTP7oX6yayhe8Vr9 X-Received: by 2002:a05:622a:589:b0:476:98d6:141d with SMTP id d75a77b69052e-47925a40925mr13491881cf.32.1743725047891; Thu, 03 Apr 2025 17:04:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725047; cv=none; d=google.com; s=arc-20240605; b=DrITzLOg5PVE2htJr90VRiYjiys32mfwSzbm0O0HjYsFuYu90SHWlHpWSQkEB7ss5s 6/pfM4DuXaFiPSU6wHzi+xgS0nTkPB+kyeCQCXIb4XIgLPVxY3hThOKsg/NhMPlD61RI HpUl1QKSBl2h+BUyFid3b66ko+k7HyNKlNZY16gjPH+Jw5x3FUtWHBWdzagnL2tWhTPe HA4Z9jNVskTCKIOiz/upRPJL9oUZbiAAEHoxBJaS2PHr+hSLR6CLGucfJxABlu7mUmzX aSqKZaRXfeS/rH2KwSjNmgO1vYBay2vzLaGqTlc5LFhVZ/YfKhRv0q5G2v3NZ846ouqx sN5A== 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=4JPE8N1C/1YRw9QGlDnar3nFanH+VdzHui8+FDaSjco=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=i+9z9MO5Y8Z6JKHOu3NQIKjWnYigVOpLBgXioze0DTz6XvNsB9+t77f515INzNnMPX 7feCkC7MKgmQpFhkCVOUCDlDWexYmKqK6PYHqIK4eTps21WKAq3d0++95+dLLi4zNGxV Z64oxez+Qwot7gOFl4Cf4QjJHlfQLQONTwZPJvLBUpM4zoPFeLWZw8GOWn1YAGCMl6qq PtRriecdTPX96sDou5MfCYMZjjwKBo+iwWRFzl12XTEywRywGJ8zhWB0iOjTyAXG+Hf8 +hNgVT5zh3zdJQwmMSXEqhCCUwaRUpq23BUAfRU551hPwa93/SeFlwu8kDPPWsBZE/MT tB3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pqp1tsCC; 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-4791b05dbf9si21566481cf.76.2025.04.03.17.04.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:04:07 -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=pqp1tsCC; 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 1u0UVw-000303-Lg; Thu, 03 Apr 2025 20:02:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UVf-0001t3-Fq for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:13 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UVc-0003H0-Ta for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:10 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3965c995151so884733f8f.1 for ; Thu, 03 Apr 2025 17:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724926; x=1744329726; 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=4JPE8N1C/1YRw9QGlDnar3nFanH+VdzHui8+FDaSjco=; b=pqp1tsCC0JaQ+k8q3BVbVlMnxNFGXU1cysDC9g+T6GVpR0iHlm+MTzCod5dQCKSDsE 6M66R2xoH77cQVWbyj81SmIVfalDRdhzcLzX4WUnDEQUspogZdi9OR27L7pqFa7qoAQE BRpj1g0EeFRqKeDBIcmAHUU3pdZXvfNNnQT7ELHEt0uMhhV3Xdr7Hj4GuzKQ5bFAqxdO 13IHbfhN6gwqmec8GmJ37R2wUxmue/x6IaI0PuWhCY/I6KirEP6V2CSjgN0Rjpd6T/ft Ih1vHStHlnXwcqvanjqAcYxR0SrCXSY5db/nV6KPk3uYU8anqpYuHQHLsyG383eF+xoE AooQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724926; x=1744329726; 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=4JPE8N1C/1YRw9QGlDnar3nFanH+VdzHui8+FDaSjco=; b=xKmD0+H9n/IvD5AIzUXAZUXUHvIzNjlZvYvJin3Xbf7Dvp49FpggLhlvBJ+1aLYFVR 5rlno8oSqMpGBAhtVC4p2EnSk+OuLwYvY88VMnkWJyiGVbL4xzva0m/zyQdclKrEr72p M4ncJI14t3ggu1qSCRRSMKrVS2sxMacHd2HKnbtPV9pSnO6CGYPrDf8hjAuiCVZH0wSW Vxxsw6hCpXqeaGLG12NjAGT5OnieVWRJcjVFv05uhxY1wZCKPV0NpLCHuWmj/sjUg8Vm YugQjgdwPOsaxZ92zcTGTKztBGmgpisQ8MOBg/lBhaGeSVqHJP6pPu3m/4iLBrPoSs1P KgSA== X-Gm-Message-State: AOJu0YxpXpbDnQclSa33YpVkp3OhTTmXg11xWE4Znc/ad9Y13zGmysGM c6uskA9g5D/TUlGibnupT4dOvvvcKJvMsE0kUdkNud9XnG71iNksrnaKTlKhPvuQ6jpirmSQnCr M X-Gm-Gg: ASbGncuDgGqPNUHy7RZVXNHwvOTtCQqHsz3u6vUg6kGZNKuHAq9ieqV/4IpnxPOIksR DFwpLNemsUZX6jhtuELxhNexxK62zsi0hyT45Zo7uGDw+/9a1uyMfDfC6HVpi8SiuZZHG5dG6EY pHvyFcEWS9Noo4n8ZpgdbkSs2YuypsjuTCk3yUm7JOX8Q7xgtEtnal6a67sC63p4eUG8l4cJF+d lRtjJqvNzRvoOpp0qB+hobGptKuc0vlf2Mt9a4JzMEwP2MTpduDcheS40xmlZDiSiFUEqbV9c39 7QMvDXETRuv/WBzCifaGHWrLf4wgKL7btH5Wj4pWhwGW0bl0PJ//lqdq6TNZCHyfTH2FvABR8vo RYhIYcB7NR6szNRbwulU= X-Received: by 2002:a05:6000:188f:b0:390:de58:d7fe with SMTP id ffacd0b85a97d-39cba941587mr902042f8f.51.1743724925945; Thu, 03 Apr 2025 17:02:05 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a732asm3011012f8f.30.2025.04.03.17.02.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:02:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 34/39] hw/arm/virt: Register valid CPU types dynamically Date: Fri, 4 Apr 2025 01:58:16 +0200 Message-ID: <20250403235821.9909-35-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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é --- hw/arm/virt.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index fe2dec9500f..e241e71e1c3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3129,32 +3129,30 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); - static const char * const valid_cpu_types[] = { + #ifdef CONFIG_TCG - ARM_CPU_TYPE_NAME("cortex-a7"), - ARM_CPU_TYPE_NAME("cortex-a15"), + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a7")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a15")); #ifdef TARGET_AARCH64 - ARM_CPU_TYPE_NAME("cortex-a35"), - ARM_CPU_TYPE_NAME("cortex-a55"), - ARM_CPU_TYPE_NAME("cortex-a72"), - ARM_CPU_TYPE_NAME("cortex-a76"), - ARM_CPU_TYPE_NAME("cortex-a710"), - ARM_CPU_TYPE_NAME("a64fx"), - ARM_CPU_TYPE_NAME("neoverse-n1"), - ARM_CPU_TYPE_NAME("neoverse-v1"), - ARM_CPU_TYPE_NAME("neoverse-n2"), + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a35")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a55")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a72")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a76")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a710")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("a64fx")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-n1")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-v1")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-n2")); #endif /* TARGET_AARCH64 */ #endif /* CONFIG_TCG */ #ifdef TARGET_AARCH64 - ARM_CPU_TYPE_NAME("cortex-a53"), - ARM_CPU_TYPE_NAME("cortex-a57"), + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a53")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a57")); #if defined(CONFIG_KVM) || defined(CONFIG_HVF) - ARM_CPU_TYPE_NAME("host"), + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("host")); #endif /* CONFIG_KVM || CONFIG_HVF */ #endif /* TARGET_AARCH64 */ - ARM_CPU_TYPE_NAME("max"), - NULL - }; + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("max")); mc->init = machvirt_init; /* Start with max_cpus set to 512, which is the maximum supported by KVM. @@ -3182,7 +3180,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) #else mc->default_cpu_type = ARM_CPU_TYPE_NAME("max"); #endif - mc->valid_cpu_types = valid_cpu_types; mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; mc->kvm_type = virt_kvm_type; mc->hvf_get_physical_address_range = virt_hvf_get_physical_address_range; From patchwork Thu Apr 3 23:58: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: 878124 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3531959wrs; Thu, 3 Apr 2025 17:04:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOZpoHYpS1m+L4yUUCe4dGW7rPVOvwSpRtRtv3Jxr5IKvDPvbb7/J0dMt58S3wMXWlNHkcjw==@linaro.org X-Google-Smtp-Source: AGHT+IEYS7F1d+mQq+NW5cvIli03S5crhPQrKfg8ltNLmAUM2HsqIR2g16zeliNiTTMVnht8YwUM X-Received: by 2002:a05:6214:f64:b0:6ea:d604:9e59 with SMTP id 6a1803df08f44-6f00de8078amr19028806d6.9.1743725055663; Thu, 03 Apr 2025 17:04:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725055; cv=none; d=google.com; s=arc-20240605; b=VE4PWMZvMDOkejHeeHVxcXpE/8mo0nv6vzH8wUCNQ6S8ApXTkb1zJiDuAwMMzmKFBu EpeffwgPZzDBXtRREaHRTOGZ+Eal7ssdMuRzUfnT3tFBwlszxj0uSxHerkr+Xakm/dB9 GHy+MXRZi+CgiQAcrr6UuqcbAGE/hvcEvQyftvVOkWSdVIQ6oR58w7ZVZaQfBtH1gxJI GS2gL0BVCt9Dy2xHVj31g0uiR93l8XDJXpY57/q8RPDquvHxv21LE91keYPxoRwb52rL VSm3zXE3o4DooUdluQ9XKletpNyemcCdbEZ/sLdCSnusTegtT+oG7BJLaL9JsCj9ls5s 96rA== 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=PRB41Zr3gSL28OqDvkaeyUBkBJ9gMDVta/60hwAlbGw=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=KrTdeRFd94NsR0/tQYNN7W9xZ6xk3fR5aVGU/D1tLGt80BByD7Hgt0G3qn02ujnRyA /uf7rHQhfS3d0N6Ol/s2nGzVJ2NMQn0n9qDpOKNO+dmusR5aGBCubgKMxZmsA2gfk9Es +vli98RQPe0od1/18m4tF/xZ5aAJAi7g8ZkvSggU0p8CQPy4wZbc0Tkm4+2vX9zCDg36 j7qId9Fa946hWMeO3ac3UtZuHTGHWTkYp45AKO+OvlVjpTCrCmcJRV7se89eJLR4pavP Ecz4a4KzK0MEre3EK2zUyDdSoMq21JkQvIsAsjOMh7j09xzz1j1+iRFED6p28zPp0wYG rRhw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mNOBWyml; 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-6ef0f10ddb9si20736826d6.254.2025.04.03.17.04.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:04:15 -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=mNOBWyml; 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 1u0UVw-0002zw-ML; Thu, 03 Apr 2025 20:02:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UVj-0001xs-HB for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:15 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UVh-0003Hz-K0 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:15 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43948021a45so13762955e9.1 for ; Thu, 03 Apr 2025 17:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724932; x=1744329732; 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=PRB41Zr3gSL28OqDvkaeyUBkBJ9gMDVta/60hwAlbGw=; b=mNOBWyml14AhBocQyeEN4CJVmVYJM1qjTOeIhH6OO5Lnpo+C1OHaY0PXYDKVNrkZ2Q I1l2ECDILyVOF8jkLDvcs46D/E94gLgLYyjM26En+LXxyiJqkjpPd2wk38/A/UeMbwrT HtAkZldugyuawFINb3i2jkopGatzWdiea3pnJ1T2UBn/t8Me68/u39bnNKhZn1mfCiit V7z2QPg/sOK+nQFh59o5ppX78e7KK3+OYxA8GiBk3dpVWI46ANB4i2ZGxWACeZZih1B0 tYCzD7p09VlYfgUwBo8l9TLwQuhxyGo1evh+k/o825rp0lGmydTMuCTJ8chW3ObvFdUb EE9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724932; x=1744329732; 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=PRB41Zr3gSL28OqDvkaeyUBkBJ9gMDVta/60hwAlbGw=; b=XxG+qg72fz5rM8/cjLlP/X28zeuBXyrz439Tvw0vtmwPQOC0R5oqBv9cNou0LRJucf zDTFDsGMk+h36BF+0RkoAJMzkFNcWJm0SOPH5sWkI3jp8Ct7YRSg/65u4Cim4ebPUPuo pu+ycMu3zaJKmgLkolldCbHkylmGDvm10ECfJrA5ZM/PIhJVw2VHuDOVtiCShAGiD7Py pgBmKo2pknyPc/aP6Clue7qkQhBfmLRxUGYNVDxFVIVse/nF0R0zCV1n8woCoj0v+fV4 xvZmOTkBzGRLR+YgOF2aj1lm0uChrhB7KXuphEE7pBRMqBM6xdaxFHv7C6Z4cZ6V2h1h YgPA== X-Gm-Message-State: AOJu0Yw5pNCHjGd9DJE975lQO1+s4lu5DDOvajH+pXnpx7CIemOMY1Kv zuObx5XwaY4sJXfQ5dE2v9eY9EoJU4+KjWpOyAYcVnMrLiZc2uQRpzswFmBjQBeZQexsBQkDQ4c 9 X-Gm-Gg: ASbGncsyJcldHlvo+ALKe3l7lquu+KRZz6itaP6e7VHwUwcvhfxZijyKqa9s3Y0ha4M ZVco+YWgHbYb5oZ1dyxbJ2RNVgSGg2eHgsX3njCqJfO6Mq+LmcgBnPFKZkEVTpvxzqixPAzitRw dEHAPbSYDwc6FNFCRRD81Z8UuWH/EktGsNWHNoMQqXpmMJYtQQBGy8157qDYJeUeqfjy/SFPxYu 5y1kwDdHCnImbpVDsP6EeFr9NjaLRjBiW8UJP4PqcmBbuVoWy5uTH1H/P8eLLvbeyFI80uDM6B2 J/J3HRi5bgHWWnw/CmhYykEloguwdr6Z1XgGokiAjsChoVep+3C2sevOdiFacgwRxnjMELpxLs+ 7yNW9o5dqvFbXiAhUhJk= X-Received: by 2002:a05:600c:1e13:b0:43c:fbbf:7bf1 with SMTP id 5b1f17b1804b1-43ed0da49e6mr7124545e9.30.1743724931659; Thu, 03 Apr 2025 17:02:11 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1795630sm35331985e9.29.2025.04.03.17.02.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:02:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 35/39] hw/arm/virt: Replace TARGET_AARCH64 -> target_long_bits() Date: Fri, 4 Apr 2025 01:58:17 +0200 Message-ID: <20250403235821.9909-36-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 Replace the target-specific TARGET_AARCH64 definition by a call to the generic target_long_bits() helper. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/virt.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e241e71e1c3..a020f1bd581 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3133,25 +3133,25 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) #ifdef CONFIG_TCG machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a7")); machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a15")); -#ifdef TARGET_AARCH64 - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a35")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a55")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a72")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a76")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a710")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("a64fx")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-n1")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-v1")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-n2")); -#endif /* TARGET_AARCH64 */ + if (target_long_bits() == 64) { + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a35")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a55")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a72")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a76")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a710")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("a64fx")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-n1")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-v1")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("neoverse-n2")); + } #endif /* CONFIG_TCG */ -#ifdef TARGET_AARCH64 - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a53")); - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a57")); + if (target_long_bits() == 64) { + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a53")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("cortex-a57")); #if defined(CONFIG_KVM) || defined(CONFIG_HVF) - machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("host")); + machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("host")); #endif /* CONFIG_KVM || CONFIG_HVF */ -#endif /* TARGET_AARCH64 */ + } machine_class_add_valid_cpu_type(mc, ARM_CPU_TYPE_NAME("max")); mc->init = machvirt_init; From patchwork Thu Apr 3 23:58: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: 878141 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3532635wrs; Thu, 3 Apr 2025 17:05:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/rLEVrJzmxY90GL2n8diEFStGP6DUaMfckluzfVVXM6COEheWZv24zpPBqAG2yu5aVsBnRg==@linaro.org X-Google-Smtp-Source: AGHT+IHF5aBB1Go2HLA0qxkaQaL838MHLIQ5LoZRQUR3ThYuHFEJqclqra/yW3WnGGWUimT5sjIX X-Received: by 2002:a05:6214:dc2:b0:6e6:6a6e:7596 with SMTP id 6a1803df08f44-6f064ae2f3bmr13046796d6.39.1743725145455; Thu, 03 Apr 2025 17:05:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725145; cv=none; d=google.com; s=arc-20240605; b=iG2V310P+Cg5sYlfzGiplgt6mG3Lx5GK1eBOJ6F3FFlmVCpLNbikjb6FM4BIPV6JB+ Gf2+rLpvo/LUlViO6MaFzNSDF4bHfy6W6ezYnKzboYaRHr7fFHek1Y3+0pd3Fj83IZQn BZF5DQFiHED2+Ms31qxjJq4fgrHZNU3cGiDrvIrLUqxXwzV/UyB8pEv1mIpgSvL6wEAS tCOcqT+UQ5PwffSPtQKvjY3DpP1mJaUada7pw0GsknQD9MAgq0YGPmn3i7SQJ4NQthqi VCmQQaBvnc7n4CKtNxvPU8CLwilSneLX7l/zjGscF2oZAAfmkrpW6rbq8cZEad2iUkqC 8pBg== 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=x4O0pR2tKGmsZXJBTN8E6GVcoNcPDwXo/K9Vu3Mm6vQ=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=fitmn2sfh8I0ZNY8oZhW/0ooxXcC89n3Y13cq5QDleVoCx/juK++MFsX9E7mz8Dx5c iahYnTjfRG/7GkeHOtYP0SpMRFCiv3HenmhwjZS0EX1s09v9Tjg87uZ5O+z5RstNSPTA e7WLxIv6HMHJbMLjFFqfSkpgxAmub7fGotAyu/n+6hHaMnsZVFMKo/zfbusdBF9jhjJW bD4arJf86FDSPlxtmhWXHqpAQKl2p/EB5leEDQqdKe+Zs9bUmk/eZAbOezN/qXOZ7fn/ ksHed+A8HjY68QtOqgnZMlY7Kwuj7whkpWwKNfhxSyj8hLd+n2urrltsWG/k7wdaW0iH oqAw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DAIRqEQ+; 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-6ef0f15cb96si22105306d6.486.2025.04.03.17.05.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:05:45 -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=DAIRqEQ+; 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 1u0UVy-0003Fv-IO; Thu, 03 Apr 2025 20:02:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UVq-0002X6-9A for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:22 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0UVn-0003JA-W9 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:21 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so9961735e9.1 for ; Thu, 03 Apr 2025 17:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724938; x=1744329738; 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=x4O0pR2tKGmsZXJBTN8E6GVcoNcPDwXo/K9Vu3Mm6vQ=; b=DAIRqEQ+H3tPMwA8zWTDNDhciAS8U6jnQGvF+qePCWik9s5IgSWUL6M65Fva0acybY qpFRhXAVVYALceSt2S5nXZA+4vW1CUC9DKZtHMf7NfNc3zyq21+9dASlDTdc3dhVX9Az DBdQNumbkkM4crM5PpOwMeGECly6u84Ep6TuFKDTDnewjTgKpMpM1eTWIQeD6nTL3l5w uvJy1OdvOnV2gmgSmaELqRcpaLoJnPmzH0SWObVeGu/Vs9Ehlc2h1ujG4CnccQqiL70x itoO2uDf1ENxcvwA6MMEMuoEgcCSykfhOCZFOjYnnm6IwUkzrqZjUGgt2f5kn7lgn5AQ NbSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724938; x=1744329738; 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=x4O0pR2tKGmsZXJBTN8E6GVcoNcPDwXo/K9Vu3Mm6vQ=; b=fgS+SEjQ41gCdbmXXXZzPs+TPaOOYFzS1GN32YuiUUvGSzyhc3mtHoZf/4wy/6UwgO /c8YeUKuL9orwwIaFBrgDzqNWClQdasrvyB3khuIfFgW9HDteAfVTu3qNVozr99xTcB8 cuastGnGscECgk7u8ZGlj4PzZD+XtksCTfHY4OKha0FVUUCSqvmAWlGaTYZYAIjkXpJj myzwwpTimu+wefdY4yiKRZboJvJfEbxkKFCS8ta5RjujGF3Xc8sc71wJjFvwJXJ80z3W xN15K+25popnlr2YpPA8PzC66qnPSWNrB0AKzPdHYOsCEBfQ96QESWj3PKl8tQjZO3BS uw/A== X-Gm-Message-State: AOJu0YyGjuW+s+MhG7j/L+qekEeaih5aNTikOOgKwe+XA0eXvCXmDN3l TkL9UJ6W8CTJQ9ufm9URn2ubJkXaBTzvyJqnQWK+OxKfoZcY67j7PPnj0m1D8LfjBZZytQo1pfb i X-Gm-Gg: ASbGncuWn4dcgCxWifv3dlNgNxLz0cyhZAqaCOv1QpUwiPHsuLMgyYGMhYbZHqn/no1 3WE3/WKHK5RMWSX05ld+DxQB54SJ8A/ZvrD31OfGcD0Jkqr4B6YaCMNWow+96mN+GESl3JmvbLG uZ8kLArQbYy3hCDW0uLW/OPUIAMPHUghJnG4bmnEW0+7UTQCUeMcqI4QkKz+3qb2cPYuIpAuR/4 7+ukMVZWBTK6IopDWJ9A0Pv57sw5Ze5DODZq4afmuYBq1HOsFAA65s5bvfFDtYHXJ/InkQ2bNtO uaFX1YxAlJ+9lGJvlyZj1qbyOGbkU2iaAjOtrSxQbpcxbyD5A9dYvQHs1l8UNsZZ0c1YDZakHBL 51K8gIX5EeHkF8vfW/Ws= X-Received: by 2002:a05:600c:4695:b0:43d:8ea:8d7a with SMTP id 5b1f17b1804b1-43ed0db3646mr3944395e9.28.1743724937891; Thu, 03 Apr 2025 17:02:17 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c30226b23sm2925910f8f.86.2025.04.03.17.02.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:02:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 36/39] target/arm: Expose Aarch64 helpers indistinctly Date: Fri, 4 Apr 2025 01:58:18 +0200 Message-ID: <20250403235821.9909-37-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 At worst, for 32-bit arm binary, using these methods will now produce a link time error, instead of a compile time one. Signed-off-by: Philippe Mathieu-Daudé --- target/arm/internals.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 86577207b85..f9353887415 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1810,7 +1810,6 @@ static inline uint64_t pmu_counter_mask(CPUARMState *env) return (1ULL << 31) | ((1ULL << pmu_num_counters(env)) - 1); } -#ifdef TARGET_AARCH64 GDBFeature *arm_gen_dynamic_svereg_feature(CPUState *cpu, int base_reg); int aarch64_gdb_get_sve_reg(CPUState *cs, GByteArray *buf, int reg); int aarch64_gdb_set_sve_reg(CPUState *cs, uint8_t *buf, int reg); @@ -1828,7 +1827,6 @@ void aarch64_max_tcg_initfn(Object *obj); void aarch64_add_pauth_properties(Object *obj); void aarch64_add_sve_properties(Object *obj); void aarch64_add_sme_properties(Object *obj); -#endif /* Read the CONTROL register as the MRS instruction would. */ uint32_t arm_v7m_mrs_control(CPUARMState *env, uint32_t secure); From patchwork Thu Apr 3 23:58: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: 878109 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3531801wrs; Thu, 3 Apr 2025 17:03:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVq88NQCBqW1D5YlLMNN7wGzrkUjbXUPFbBmRbqwUQ8//TD7eZtLwcLXZzykh1geBTaoLzIZA==@linaro.org X-Google-Smtp-Source: AGHT+IGJFrjHFaT+kIlSAjg+1x5WYdJnzAbg4RlK0WH/LkcDyRPzGq15lxCa0s3jaf7Xkx8FhxaU X-Received: by 2002:a05:620a:29cd:b0:7c5:55f9:4bcc with SMTP id af79cd13be357-7c775ae02a3mr124275385a.44.1743725036789; Thu, 03 Apr 2025 17:03:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725036; cv=none; d=google.com; s=arc-20240605; b=Bf63QOlxeyjW1EJ6dwp1cEQ/1Kim/KpG3yRKwRZ8fHD7RHmv3L6zDsnzvdEfr8QJ2t CFaEzmP9ucWqLUnYIWOoZKtzyqQqgxg2kOlNlJURrl1jJOOubN0INeduLwpphS/CyVkv bPdIEZDFMUoU5x1YpCajy9TcGaq8Bmjtbq56IcahcJeVm1sL6JYULEiRvV7sC6UBJwLc NoyT8Cyr03UFYi+MDmQJ66oLHZzno0DS1yxHUI+ccL2ec296NugqHLlDZvgr6JoZsiKv W3G0TnVt9TjOu7W/FY5NQlPxLE5bx2xKjyLEAcNHEHa1p8habUuwxECv4KSFj/g07W6p 1pcQ== 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=RwcqQLVLsCf/9/gdCQJlK3me9QOHV8t+9EaOZdXtMvk=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=Sbbo0uZu90u4lt+muwvesjg/EZFj8ds/ekLzs//rZ27xx1EP0U1ZVEwP6NvQkwWVza yYODSIIllFUaXgbcPFJIJG0kYsB78gCytmG5twEMMVdysdC5A6kzk8K+SLS5R+QBWGX6 Mrw7WeNiCgcApNn1vmm0aRCkt4iZ9KvmnIPH/kNkhTHilgAyYff9FGgldP+G1+TCccFS SjIB/qoJv1qn4jW6KrM7w20VqCgFPXvCByeN0Zt/xolNuIDfnsedWDFdoQQcPrOvDlEq KpVXLNThJQLccGYB7dMTxwrBoR2bTOmzomodcSBrFgBk0YQVi504TlL92WrRR3vJ8dA3 A2gg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YQRFp8Hw; 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-7c76e95ff4bsi214793285a.192.2025.04.03.17.03.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:03:56 -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=YQRFp8Hw; 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 1u0UWA-0003oo-WF; Thu, 03 Apr 2025 20:02:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UVv-0002zn-U8 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:28 -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 1u0UVu-0003K4-7F for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:27 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39141ffa9fcso1697518f8f.0 for ; Thu, 03 Apr 2025 17:02:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724944; x=1744329744; 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=RwcqQLVLsCf/9/gdCQJlK3me9QOHV8t+9EaOZdXtMvk=; b=YQRFp8HwL/Q6+CbhKgD2GjYY7dyGzaYCAppP1nCuSnCNKIejhTIG2rIcNmaTa4AFVF CTLnvnDoBYArLeTnFZGOzBiuOtfqjI7QPzK1xDpwdt5Pu6Ho+RKP+/lVZi2wTfmg3Xe0 JY1I9M6pDIZxXGytFFop3N7sEGdKd6kbJfZEXzws3JLgMMZs7Tl8NGcX5Mr9r5gG1rJo SqqZtx0NgfvW333lyPWdGXqqst/1IaMRnpzTK3cQSPCxkfsy5TxJfNHv+GfQzCPVt9ae E/DR2wXneNuA3FfA4CI3zZslip9AYgrbB7ao8X4yiX/S4S0sjcTLT+T1joXA/uZQhqcH lrYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724944; x=1744329744; 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=RwcqQLVLsCf/9/gdCQJlK3me9QOHV8t+9EaOZdXtMvk=; b=JU4/h+G2pw5Of2c1uHzUJl9XtRxLO5Fc2mtrr6oZcKeG8jfl1+4ua3b1sdBcsWixvg evtFFnCjlLCZwD3USoxwjZOw7xCwvN0emDvVAfevx9a+rp2Yp9/uz1D6D/yw+HvTZ+s/ bGxexZRTOZvMvYGz/VI4XoPM1BqOeN6So5g8JL8yOavoVLofH0ArM04XIs0lt5xCFuF4 k8gE+4KUqP4hN0qYw9AdAho98iEZgXookd7gqZdo3I7suOSOrfD/xV0ourGSM0BeOP1q OUAdpnkQJiANNBeCrOeQhsvhpDbIRNdmuEHETdUbypVwRGp8HRPIUfnrhdJn8hp0Op6y jz4A== X-Gm-Message-State: AOJu0Yx8rO3kcO9UzQg1qyBBrZElZ7nVakz2j0IbTwiOc0u0+n+UPC6e rg7m5q5zAZAYTDi5sBS+JJ5NvkCYSEkoZ9C6ZrvN25cJwbVtsEYnPeavfq+RDYYqBcJIiP6vuZw l X-Gm-Gg: ASbGncsTYCNTeeslXTFlBzJ91M69NpUhAv/Kry7HhL6UfWKhU8CPeJfbZVLfP9syDFc sE5Ibq/CIaA3L+bvBnWg3r/Z1taNaoQC/XjJKWbatMMqNKsxgPKu+9/6xKKnkTXgdT6y+IOwFI8 xVctdrPOwGbwH4KcWtDNbeM2zgECna/lPL3KaqUMRKqAor80qteU/bIyHZiqYAts4u7vGUyAyTX 6ky7BoNWNGbNXcjWcd6aKwx7GpO5+YtIUr0zefDkZGYh2A5EjURiH3VLnnWpMZP96gTi8uo8Yig RE9vL0Ct1m19bxTgn7LIkeuRCbkAGk2v9ePguWWq3Jeqc7tBZ2y+S/yrzRDd3hPmGK9zqil2BIC RCwTMg/4/1UVwMCCft7U= X-Received: by 2002:a5d:598e:0:b0:391:4c0c:c807 with SMTP id ffacd0b85a97d-39cba941808mr964267f8f.53.1743724944480; Thu, 03 Apr 2025 17:02:24 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a9da1sm2921791f8f.22.2025.04.03.17.02.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:02:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 37/39] hw/arm: Build virt.c once Date: Fri, 4 Apr 2025 01:58:19 +0200 Message-ID: <20250403235821.9909-38-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 Previous commits removed the TARGET_AARCH64 uses in virt.c, we can now move it to arm_common_ss[] and build it once. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 7eb49c7327f..c46e5036722 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,6 +1,6 @@ arm_ss = ss.source_set() arm_common_ss = ss.source_set() -arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) +arm_common_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_common_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) arm_common_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) From patchwork Thu Apr 3 23:58: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: 878117 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3531802wrs; Thu, 3 Apr 2025 17:03:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVr+7RIGy2cboV+0xJ7hiCbtVfonWoxb5ww9mJVuPQB+cN+vcbDHiZmGIkWZA6aE0zWbk7JDw==@linaro.org X-Google-Smtp-Source: AGHT+IGfoBYakiRNsjspfUlGCZK2MFk1mYSJP3w5ydCdf7p9rMtJOGD1FV5q5nVrXAdL1igqNPIM X-Received: by 2002:a05:620a:390b:b0:7c5:cd94:adc with SMTP id af79cd13be357-7c774d32d11mr172292885a.21.1743725036822; Thu, 03 Apr 2025 17:03:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725036; cv=none; d=google.com; s=arc-20240605; b=Nz+hRVPsmhbbBXqJDEyMMVvvYOwHWRBjSs1lIee4jP+EKuImYS9QDWe0Bpx+df/GWN ggwDJaVaNZ3LLoyaVJ3ESWJz++eeJJA9e2gBZzVcvGtfbuzohFmxE+14JAgLriOCcSCm WMy/jF6Vx6xi4PQWZrhztdDYYsEInUt9Wi3AU3hOOBOc1DS0E/uQrKIDnkLflppvqq/2 tKQjGB/nNV8/PKxohdRz/meIESSw3XDAI9vk5jdonlTOAvVJsuZKQUYkZjSWdZ3Jmny5 o/p4EBrt8kPKrblPtk9Ioqoyb76+tGxHhdi52oZT10BM0O/Ke3B3nhsLmWXXSVeAkX6h 3lOQ== 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=YdaEC/09b6goQVlqijhfvoV2qVf7kL62iAT2aGCf0/8=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=fhojiFElRxQYlghkCFz+xepDVW+V9OWAbvAAfsmMZLELzYwqzAPKw0F1lL2dBgNpaV NY/FQ9ui6SvwPXsnbLYarSu3F4Nl84RIQYaPAJX0uh7G0vIvT70zaMmCs/lWeMKOAcI9 k4cNACEgSBkZZBeRhjmh5NJ86rWeDy3rFO6SN6egRcvx1AwZwGwQ/IiV3ptH9tysgZU8 pZc6IAUOeBJAOtuIuBN7HFIiCWBjJDV+KnABdDiHP72fNZoxv3dsDDJF5RewZuCUsRCt Uj/BKWd3ZlJfHKjLk+tXBPyBMHxYwKFxuhYz/mdzmwA3mGHSO89eRKtsm9QnSxNH6Oa9 N3mg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dlLajGiS; 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-7c76ea59d42si218209285a.286.2025.04.03.17.03.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:03:56 -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=dlLajGiS; 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 1u0UWC-0003tL-Fq; Thu, 03 Apr 2025 20:02:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0UW2-0003ei-Ab for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:36 -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 1u0UW0-0003L4-JO for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:34 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39c2688619bso954206f8f.1 for ; Thu, 03 Apr 2025 17:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724951; x=1744329751; 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=YdaEC/09b6goQVlqijhfvoV2qVf7kL62iAT2aGCf0/8=; b=dlLajGiSZM5gaiRenq3y81dPvlACvXb4RJBajSw/DFy8wRV7ZUmQBLmw6WHLi6XU5t ahD4CAAxNSNsjogopoMGdFjcllFxXaN3pqGG4HRK6XeoltTQLDgrv05ApOlQokdrePIF n3CM+CC0BuCkf051eFBOiPr/YyIonSfvp7Brz+M6+nwCTLvQlaIQ8X/8MQgon51eBhxl +mKGNmipM/Z4JEh2uXL2Fqo+5cdJbF/f+lskwPINucinxAVYsRDADUg2o3LqVYuCmaIv WudI8vUPBPZ3FMJrVMaf5OMic3MWjBEqUAadLE6WI78uyFU9umPVwxbAZHnPc7E3dmns vi8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724951; x=1744329751; 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=YdaEC/09b6goQVlqijhfvoV2qVf7kL62iAT2aGCf0/8=; b=PSr27L2gM6IFjzRabDH53hcHgxCu8umagwFVOjt+BoJE8zYPa6lOtyeyLIKCu6Awrf ADiNMSP3IZN2XaUdFlaZx1kL/DQHcGp/2D7/kT5aSqFTo7m3BJSZSpla/f9CEZeMUO/M fstJo7I2rT2rVUQvEqfSi1C9Jqc0T2ceAvm3CsLHACJPp74EEnePuaRlB2F3bi5fAOz6 uJoMouDfjY4Es0aDxA1XbKlgp4iWgTKNP77ebkF0tS8lCaRl0H6+X37XZty7P9avEEwo F75zUUZvd/lLzy3QDyTN/2py/sBM07QzIM0E4y5DG88TypfzvyioNZ/3nncR+OKRe/WE 6q9w== X-Gm-Message-State: AOJu0YwrKNzVeIHlKMhNllSID+1WQnDH7enrAhiL5rsyb4p3bZMZoPqD UOzoHErQzyzHiCJysSjGlKYdHjhQC1Ula1WiyJHY8+GPaUL4ATdvNxVczgVsWRVXfWeYHSQuRUc A X-Gm-Gg: ASbGncu19WNlvYiVeZreCZQ5+ttdwRhpohrQnEavPlpSdpL47Knm1BSJVHj2rKiSrpn 6A5F7QYPSqTZ+uLujlxKKvh+4QDejhXK/+NFDp/YFcuSNyAiK83Bz1borge9mK1Cf3eilTFwKnR uhtvzIc1WfiKCsRp6zUkQ6TQnVEYCXJnnh5w/wbqK5bIC9t6m2p7o6Ol0HSOa9JA3XgyGoZpg98 Ar79/PqhEmN5zQYFSVgzhBOqQ/4kW4RJmwK7svm2vLVRtfKD9yWlcAsqf0JH8QskiR3Zg2fwf7o 4EkuAncb3xs0+y435mzHkKmwK8/SHB30FATyP2FZ8qt5/1k9A3Uds6NnEyo5vfd3gHIiGSpTfBh NQpCgKkwZH43xmMwX6gw= X-Received: by 2002:a5d:59a9:0:b0:391:300f:749e with SMTP id ffacd0b85a97d-39cb35b2592mr929112f8f.11.1743724950868; Thu, 03 Apr 2025 17:02:30 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301ba17csm3011179f8f.58.2025.04.03.17.02.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:02:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 38/39] hw/arm: Move xen files to arm_common_ss[] Date: Fri, 4 Apr 2025 01:58:20 +0200 Message-ID: <20250403235821.9909-39-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 Signed-off-by: Philippe Mathieu-Daudé --- XXX untested --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index c46e5036722..61f145f901f 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -63,7 +63,7 @@ arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true: files('imx8mp-evk.c')) arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_common_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) -arm_ss.add(when: 'CONFIG_XEN', if_true: files( +arm_common_ss.add(when: 'CONFIG_XEN', if_true: files( 'xen-stubs.c', 'xen-pvh.c', )) From patchwork Thu Apr 3 23:58: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: 878123 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3531958wrs; Thu, 3 Apr 2025 17:04:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6LlANJXsZl2mO6inW4SgLmcRuMvDi3XcR1zpwjalOKlxGMa7nZBGFbArp8/fj5dlAouTrrg==@linaro.org X-Google-Smtp-Source: AGHT+IHnguwuWfZHvpjiCsCqzLdRMyP3kEWesb7GrnRgnPpvsvaA64u0Is09s3L5Vd9B5GUTzjcS X-Received: by 2002:a05:620a:1991:b0:7c7:747f:89d0 with SMTP id af79cd13be357-7c774d250e7mr201851785a.18.1743725055639; Thu, 03 Apr 2025 17:04:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743725055; cv=none; d=google.com; s=arc-20240605; b=c8RWONLrRXzUSnx24BzJrOCM5lP9r5XwX4scQs5QXTD+5CJ6mzeCoEhZZ/qs8iuu4B 6tAehDkJnMPPy4M/xT0fS3E6EqatXO+c7Amc0RiqDpfJobNEIwXbKE/z6iCvNcbL9DQ+ 2NVS29vOGKDte9RXVBOPc8C/KSVmmPyBRrOZttHIlqXKNRm838jSR+QBrpOWQT9sPkrg 2iel38//Ylwf2F0yjwpB8RmbuH5SDzbY4R1zOcZ8xjBjAB0OCysS6vP/WwIu+fB4PCc0 b9T747Q5UfsIR3Y6Ugd7uPw/QksSaQJkmcEt5x6jjYl72Ci/z9qgAabE5VdhKbRkCvrb 6cig== 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=Y8pJw8cPhR9UAP5Jbu+JLKafXySYzE5GFtajnVdfvaQ=; fh=cGDjR9+NH75RtMqDHQPhCvgcQemKyI3acX9LAGXbf+c=; b=MGWHj4mSJWdbE6jKZ71gbpSYphCO9BCOyi4yBU8dK4OFan86rnKRoMVzzXh+9Tofu9 V6tnujlTKceb3ShHK/nkifo3o7IRQwldYtzwsBrs2aj2kcgAmZV8W0K4KPz4+9Ns/V3x TPR7U5Mft2m3oTywSpLpbg6VoWJ3toKDJRt06iiPGtR76BmuYqoxSlot9O50oil7QEXS 7sy3tEu3ijO8/zfNOaaw7zRrMz3VgjkXXGmwUKcKGc2nLKrtDBLzd1pLB//MZMl7fz/R B+6kRXIQWSmuKqWVUD7BBDRStKo8JLF8zFpiza6smEhR9Q64+jJLmMUkVFDiHzA23wY1 H0/g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zpxdSvDN; 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-7c76e961675si224920085a.193.2025.04.03.17.04.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 17:04:15 -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=zpxdSvDN; 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 1u0UWJ-00040Z-GG; Thu, 03 Apr 2025 20:02: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 1u0UW8-0003nw-Fy for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:41 -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 1u0UW6-0003Lx-Rq for qemu-devel@nongnu.org; Thu, 03 Apr 2025 20:02:40 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so9937345e9.1 for ; Thu, 03 Apr 2025 17:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743724957; x=1744329757; 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=Y8pJw8cPhR9UAP5Jbu+JLKafXySYzE5GFtajnVdfvaQ=; b=zpxdSvDNBekrRJO9Ej4v8f5yHBvVcp7wpc2Kpb2W159ybQzczFFr+fk5PQPmtOrQlq 0+//9Hny2oho0XLx4qa99p6WazOXzR9fl7PJeX3pijzVUNb6FQ4rkJSShtSWm/Ai2YMJ VahMWA4u27gQGzns/UTJnPWURQySCsaSlEsGzgQFPXVjoT6BlnxhMWNevnQmY1tp0xrB etsv/3DvdmL92eJMmPaBFlvffTfAWxWZI+csSr0QNY++y+DKQL/s4zzz/0RqPyc0g/P6 V0fmsRGUdzmMWOsoygo28UY9Br4UGuEmX/2vdDn19Ci3t/eK6kCVdKyhryuM9UNfGrtE ZZHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743724957; x=1744329757; 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=Y8pJw8cPhR9UAP5Jbu+JLKafXySYzE5GFtajnVdfvaQ=; b=KUKa1apMQd6xlizy3gkBD3r64IiTqSKGp7J4MJljSHeY+m71jfzXFY7t8UqpgPto4r Pj/b1KYuxPrHYf6ttIvOTstex0xiwF6Qqr5oWf9kT+phMkCzVszapVcP3Pw5Gc+q8MBS lbiUzeEboHffOviyIgbQn6PmjcbumCdMKuD95Adojk/acFY+sjhyq32BvWjkDheI1+7V ZyzTF9rM21gCh2ilRoJD9+cwwE0WV6lx4L2uIh8hfaPioBa72ki+ibfwPVRv7AaLQmjA dh6czF6K4L1jRsJ9Zjc2BytWf6DW4qT7ViX7QFLaGBbfDflWrLS2vMwaQKDdXcjnvG/w /ygQ== X-Gm-Message-State: AOJu0YwF2xGa1UWWNe/My3OUTPdyrjwHLssOnwgS6Y9uX26MZuJo+Y/a IbUBqGolhgItukKpo9ULHffLaty9STh4tY+RdD+Jut122Mn84TAYgDeAgYuHeJjMz3l0YB2nP0Z L X-Gm-Gg: ASbGnctxzMwgU3ysn5Unv2jqW7E8RB7ssUlQvNNh3Pp6wpbh67mtlmPOdWFqbqoBnkE gV6o9BtbFKMucjcfFAKyYqcTbIJDsnczBFtKY1gufWpWGr1T7yJiAOeqUMb4jo8N650MRHWQFrD hmRzmktMyh2/BC7hSD6yPRezdjiCC5qIzsvP04xQ1qU0rAeQpFb7KnL5TQPnGVwQKpioF4FpMa8 hQbRTcs8bOOn5zvrmmaCqTHkm1tOn4QrZEGykKI6dho0lmWJON53v9qQKTjxd2egnUc6VNtlcJ+ J21fbI2tH103rGPRvlNfC3PAMnxa3dq8/rQhfsEdq9opfPBAaWsxJEXkfpLtBRUtyjRjop2nOHW nv2Hy6Pc8IDYsTb7uiX4= X-Received: by 2002:a5d:64cd:0:b0:39c:1f10:ba54 with SMTP id ffacd0b85a97d-39cba93bc91mr891063f8f.35.1743724956987; Thu, 03 Apr 2025 17:02:36 -0700 (PDT) Received: from localhost.localdomain (184.170.88.92.rev.sfr.net. [92.88.170.184]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c30226b23sm2926410f8f.86.2025.04.03.17.02.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 17:02:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Markus Armbruster Subject: [RFC PATCH-for-10.1 39/39] hw/arm/meson: Remove arm_ss[] source set Date: Fri, 4 Apr 2025 01:58:21 +0200 Message-ID: <20250403235821.9909-40-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403235821.9909-1-philmd@linaro.org> References: <20250403235821.9909-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=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 All units are now built as common objects. Signed-off-by: Philippe Mathieu-Daudé --- Yay! --- hw/arm/meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 61f145f901f..476e6048939 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,4 +1,3 @@ -arm_ss = ss.source_set() arm_common_ss = ss.source_set() arm_common_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) @@ -81,5 +80,4 @@ arm_common_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) arm_common_ss.add(fdt, files('boot.c')) -hw_arch += {'arm': arm_ss} hw_common_arch += {'arm': arm_common_ss}