From patchwork Tue Apr 22 14:54: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: 882989 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2456720wrs; Tue, 22 Apr 2025 07:56:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6FDaWz9kJ3vN2knrAIk1GbL4WdfUF55wBPLAEI4AnYmczHmlStOl1WCHByWyfQQcChjScEQ==@linaro.org X-Google-Smtp-Source: AGHT+IFKgNlxr9+xoaAjOL9EFFKp8/0XU65/4JmXGjmKm/bz9nN8mNrUl9ridj65VsLwSxr/aFS3 X-Received: by 2002:a05:6214:414:b0:6e8:fde9:5d07 with SMTP id 6a1803df08f44-6f2c457c34bmr262163076d6.26.1745333800066; Tue, 22 Apr 2025 07:56:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745333800; cv=none; d=google.com; s=arc-20240605; b=aCedUEYbMcwNEIZm4fhKwagEfxscAX3prdeMT8t8n3adi2l5Qs6pSEfRPpFnP496rJ mbBfv1LRZGe5HVqqqm7DjhlkQw8ARR26MNLs/oQV29oRMMN8OA4aghg+Lou8q6rl+o9n nGFIOw6I/qh4MLLRlVTO4NHaian36uqX9NWiQ9x7q4z56S9XLU4vOsrI6bENwmwuCdUV 4fYudP7DypGO0Na9fXE1TN1v9qk/Jdr42Cs3RAgtct+T4+gSRAj5ZQd8Hyuonbjy+sbj X0Q4PSoFHlQ1QbOu6UmV0y4hsifPaXNOyXzTvv7hGcdEHwF7jpX5SZqzPKPckSIdVwtc /mCw== 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=cV3mM0ENqcZ01CB1iRk+m5MtZMh95fPFHAPIzsRChqE=; fh=98FKcUbfHOMAWlQQi9/5y14VVYgcGa56vjU1mKYkvXI=; b=NR56D/Hj0Zu7eFnCpMkEhTXU79OGHelCfil5yTesMyECa1d09oMGZvB2zuwYB7xaw0 OTNOHl6OFJsNJGYrCtszS3ec+T5H3XQ2MqGQB4v2faDk75gHRcMFNgMPtg1/46uL6cz2 uFgdDSqM/qPRaK6jy28ERMCiOyMaH60a9XnNc7+jHhsBdyxdU/BoGJmzrfYXARVDH79p niexWc49NRVcx9KAJThcputcDsNBazTr8fM6yWkxs4so89Juil+qhkcR9xwlYalCfKPl 20XaLlk+nQj51wqwSJnL7+H3TM0nXW06o2UxFvZcAtSKHmLGvMv5V4vN4rKcysr6LVAr ODVQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q5IyOefQ; 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-7c925b81499si1128992785a.205.2025.04.22.07.56.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 07:56: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=q5IyOefQ; 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 1u7F35-00088p-5h; Tue, 22 Apr 2025 10:56:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7F2t-0007eZ-RJ for qemu-devel@nongnu.org; Tue, 22 Apr 2025 10:56:26 -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 1u7F2s-0005GR-5Z for qemu-devel@nongnu.org; Tue, 22 Apr 2025 10:56:23 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43edb40f357so39627605e9.0 for ; Tue, 22 Apr 2025 07:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745333780; x=1745938580; 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=cV3mM0ENqcZ01CB1iRk+m5MtZMh95fPFHAPIzsRChqE=; b=q5IyOefQx08fA64F7R3y+xuNwcI4Qp77rviYIqkQNEOKZWS3Dq818GZNFqZD9zMXPX 5SsCkpgilkRc2kdMr77KGoXDekxYEgbJFKCfH52UxtJ+wRuuW1fSE2KYYj4n6bwrnjbi bz/hJRHxhMyDwWDh/kPXq2kK+KAds0g0nE+AcIdp03oQA/DNUuhBLUPQ8iNtDCqEUI1L khg1pxg/vQzEyngGkvGUf3Bz1uhvaagRC85KvviixMbxdSYuTQ5zDjdhXINBjJa/mKfb 7lODHs0OMkaxI1Rrz46AD2+xugyulhnVN/svFI+oo0TPFkOiIYyLRXQI3xe3Wj5WRFGB 0E5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745333780; x=1745938580; 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=cV3mM0ENqcZ01CB1iRk+m5MtZMh95fPFHAPIzsRChqE=; b=AF6RB25L+v8Hlu0fRbwJjXVYfgxHBW9vYLc+MkkBnuX440hC8HOplDCKc8WgHEA4eF 3c0/ypTnxrWHX/1nWdbTa2GCapgDOM40aMzxxnMBY0NS0yGDHRw7nWkPcsG8l1t1NZNp HHP/kTVnMjEOUWmsdyvSjjyGn7Jc2wck9Q7wEX4heiZp4Dsl8UXkJE9idE9g84dD/PKm 6Tk/vzJqF/TfTvtzAv2vP9PPe1LkTrjxkk5iNmtKgpiFyB+yOPTLl9zphnZVuW5P21z1 PRaWH0Trnp8dkWwDrs3bjQd9j1As3067OzXZzlEVLC+YpS4IGqwFc7gPBtxEPWTZHJYH HiXA== X-Gm-Message-State: AOJu0Yz8vgKnGTr2awcpyp5EzeH2sPe60ul0Wtz9gHXKcVGnFlXStbMI moQDSZSb/S2to0V4V8FCLyfZyqIZZcarv4Ke/jnWvHOcoOSghHewA/AMZMFsw80= X-Gm-Gg: ASbGncsEZyp90OPdFu63fovDlfcU+JU5MGaZ1Vnor7+1YvfmT9UPonr3tF/KkdPKIxl VcdcOkbCZlQO1qfp0+azXQmohKKC0Ig4Ermx1ivKHOp/6kSXx48GQrI8AkEwaJizZJzy0Qp0m6D NnNzAK3WT+HsdbZIgfp/nuPvK4CiDnz17uOX+Zl9ySW4yC9O9SpqQRDS6s7SWZmQJWNKUbva1R0 FwQ7QNIu2+UOgJDkkuMi8gIm63B2+8FzkN1P91rMl19dr7yGKVAMCGbfdGh37w17Vr+NVMSRmId Bvihaswy6tm9ohFd3ry2JwOG6ghnN6L6glx8n6pm+Qr0Yg== X-Received: by 2002:a05:600c:4706:b0:43d:79:ae1b with SMTP id 5b1f17b1804b1-4406ab96b35mr145085575e9.14.1745333778309; Tue, 22 Apr 2025 07:56:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d6dfe2esm179084965e9.34.2025.04.22.07.56.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 22 Apr 2025 07:56:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Pierrick Bouvier Cc: Richard Henderson , Anton Johansson Subject: [RFC PATCH v4 16/19] hw/arm/virt: Replace TARGET_AARCH64 -> target_aarch64() Date: Tue, 22 Apr 2025 16:54:58 +0200 Message-ID: <20250422145502.70770-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250422145502.70770-1-philmd@linaro.org> References: <20250422145502.70770-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 Replace the target-specific TARGET_AARCH64 definition by a call to the generic target_aarch64() helper. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- This removes the last TARGET_AARCH64 in hw/arm/. --- hw/arm/virt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d7197958f7c..4e11272a3ac 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -32,6 +32,7 @@ #include "qemu/datadir.h" #include "qemu/units.h" #include "qemu/option.h" +#include "qemu/target-info.h" #include "monitor/qdev.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" @@ -3137,7 +3138,8 @@ static GSList *virt_get_valid_cpu_types(const MachineState *ms) if (tcg_enabled()) { vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); -#ifdef TARGET_AARCH64 + } + if (tcg_enabled() && target_aarch64()) { vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a35"))); vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a55"))); vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a72"))); @@ -3147,15 +3149,14 @@ static GSList *virt_get_valid_cpu_types(const MachineState *ms) vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n1"))); vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); -#endif /* TARGET_AARCH64 */ } -#ifdef TARGET_AARCH64 + if (target_aarch64()) { vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); if (kvm_enabled() || hvf_enabled()) { vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); } -#endif /* TARGET_AARCH64 */ + } vct = g_slist_prepend(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); return vct;