From nobody Fri Nov 14 18:17:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760998607; cv=none; d=zohomail.com; s=zohoarc; b=BZSxzKryy5X/bhhDu/KVElmJR3NpK23jL2M6A2DsKK6/8rKo/YH8ftlMlkfp7AADV9iTkcrDaN7FLZzmbEGPUfH+e2/djosnCmhppmVYMVE+YxeqcHrItnIvXVsWDP3DmWWSNwuwVIx8UpU9ODuZIEyCGBdKbuxPqGcC/CLW0LQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998606; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iIq3d7ugauwSFwb7NuuD2EvqM+PTyDDPePzmnW8HEF0=; b=NARvGVz8ooSLSBZY4PJfkoUihCA0cAY2yZJTrg37pgrCcOkyPFYvOMDuMcFvtZuRNDpKUJUjm4ob8/zMRZ00M+tPa0UCAb8r+CgnQiGBMyekBmkRbgi4tjTxwZJu5x0h1p855H4GcBuROKOnVAeJpr583UlB7G9RvdhCwhe6MJY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176099860679086.087396749621; Mon, 20 Oct 2025 15:16:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyAL-00084C-4t; Mon, 20 Oct 2025 18:15: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 1vAyAG-0007y1-Ib for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:41 -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 1vAyAE-0006ov-RE for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:15:40 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-427060bc0f5so1553230f8f.3 for ; Mon, 20 Oct 2025 15:15:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b988dsm17559204f8f.35.2025.10.20.15.15.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998537; x=1761603337; 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=iIq3d7ugauwSFwb7NuuD2EvqM+PTyDDPePzmnW8HEF0=; b=m4ltgyujTSAmigIYp29BjJOPboFwKb62WK6DyX4T/yUbdJPyHJVjWXVUBKEM6XkcJj FkEEfW7R4u/HMjHNh+53D26ZQLqfZm63QRW3Oev68OMilDRqB72ZxSukQ2quSA7U/bbr dz7zv1a7TNBV0LMO4tYQk/8JfGw4T+cUkuHa7zvVc4T0U/ugHQSbhEFBX1hEw8w83mgh kEVjIYhoEmbAaFnIBw2XC9pSn8ngOc67YfmHw2EtlZtP92hx1zXZKmY7g7M3T8lL/WiC QbUsmARDqJbO4j20d3Rssq7mpFEtwIQYciMBVXNS0kwMWQnNIYO8fIGiIL0zS2yKhfFy 6yAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998537; x=1761603337; 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=iIq3d7ugauwSFwb7NuuD2EvqM+PTyDDPePzmnW8HEF0=; b=w7G5DgpQFaTt4AejJrCUhbKhRTQJEuCiTTpHm0lMeUDYnXe9xpv9dJYiEk7YFZXuks nywr7nkqbAFTHu8lBLmFRI9aka8ld91zkWAp8atYkm1/EMXNOQvnpMC3k17nWJS1eoqs qlQjBEjcgMNSBt8kH7SmraXbE9OkGp2miwPPeOg94/pvQo/5HDED+R8Deob37Uu76sYG 5U4N0k0FCVCIpdjsSi8XOfYhCE8wamkB0jn9iNdryBpUN4QFs3BM3e4EAFXOweMecSyP 6hN3IWWuyFc7M8PS5cncCA3fJhBLZpPSetGA6QeqqbpQrZPsk0mWfJNNjKFgacCYuUMp RQQA== X-Gm-Message-State: AOJu0Yzjv4RNw50V3KkxtfpnMObZv+s2O861HBK1ModF79a63kKB0vc0 NZBozkdsSRQRltIFNuVxj3smooM+FOTnUlO0CDPn+3kERxTQCoRLyFMQkp7/cC1Mxd3oPn7a8I/ jv+A0XDc= X-Gm-Gg: ASbGnct+kSkE/lx7oe0csbqdL5uHoJN7+yfN/Wr18jINTBe/AKHGRfZmvLnacTigvMh dddTuqzgGpU2mX/kpSTBRiSzvd4HmnBTnHB7ZM8MOWv4qztbcO3JwZvpK3svtcbV0Z84qUNiwAn BuF8nW8Vldo1wlbif9MJ+g1VP1CD/XxmC9aMcFqlK8ib7bs7heNcanRJnBBOg2E/nV7JUNihw2N fA/K/HNrMtZ6T6tXvmRreIaWkkoKvu+EjVZ4ge4Sooun+xMwtWRNxQfm2IkMtmnhNGNZnTCPQUf yi3xAHqeRxNpNdRmtqx30Tp8brbh1AREcLvomyWbG5CpiaqPXW8tQD6X21ZONqJzzjmh8wAYBoG 11xDuz5xdominw8s4YBqVJ7E+OJVDSOqLkvm2AruKcwIV8EqIcqrdRogq9VBrY4Vkqn0ChC5f0b Y6UNl59eQYBj9wy+iqtpIouWSzuO6NKNFpFBUlKH5ftFOY+eckpw== X-Google-Smtp-Source: AGHT+IGOzC8NFR459Iyg/x6I6BazigcAwIaqRGlvru5H12xY+WosrlT2e9g6FJOo/25C9FnSr8Rz/Q== X-Received: by 2002:a05:6000:2405:b0:3ea:e0fd:290a with SMTP id ffacd0b85a97d-42704d9ccc4mr9710219f8f.12.1760998536901; Mon, 20 Oct 2025 15:15:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell Subject: [PATCH v6 21/30] hw/arm/virt: Replace TARGET_AARCH64 -> target_aarch64() Date: Tue, 21 Oct 2025 00:14:59 +0200 Message-ID: <20251020221508.67413-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760998609350158500 Replace the target-specific TARGET_AARCH64 definition by a call to the generic target_aarch64() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- 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 d3809754460..dda8edb2745 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" @@ -3263,7 +3264,8 @@ static GPtrArray *virt_get_valid_cpu_types(const Mach= ineState *ms) if (tcg_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); -#ifdef TARGET_AARCH64 + } + if (tcg_enabled() && target_aarch64()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a35"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a55"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a72"))); @@ -3273,15 +3275,14 @@ static GPtrArray *virt_get_valid_cpu_types(const Ma= chineState *ms) g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n1"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); -#endif /* TARGET_AARCH64 */ } -#ifdef TARGET_AARCH64 + if (target_aarch64()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); if (kvm_enabled() || hvf_enabled()) { g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); } -#endif /* TARGET_AARCH64 */ + } g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); =20 return vct; --=20 2.51.0