From nobody Tue Feb 10 01:33:14 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1618594871; cv=none; d=zohomail.com; s=zohoarc; b=B5uShjXl1Ru2uYETzopbw0TtWB7DXPLNbO8DgJaSuRRJ5APxwLvC+QdHmtHd6sfmmbuvKzdz2Q/eiX11w7zfUzqzrei1Uc2fMM4InzU9Dc6cZtWlKWAwwpNOPYE1iv4cWbrilkofkHQrAWaRYeMbFDUpiBhNk2srVFgDQwyxtY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618594871; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vPOMEVfKp8UEivCsVCGaEefXEiHwxcV7M0EC+edP8WU=; b=EXDRWSXBKA5c1LEWjUAfim6M561n3Nx3vn4GjymNnwucUWHHlycvBroZ2wG0mDCYWG7qGteXjyEX5aGdbk6Hk5XKmB3Lq0utkQtOHgogXWCuz9sfM6X81Gr4e4Uu/E0CiHLTHMO/lrREmFl9uTik855f40PvW5Pwyxb22R8R8ss= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618594871503101.97018044861295; Fri, 16 Apr 2021 10:41:11 -0700 (PDT) Received: from localhost ([::1]:55158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXSSs-0006au-FA for importer@patchew.org; Fri, 16 Apr 2021 13:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXRLc-0005KW-LC for qemu-devel@nongnu.org; Fri, 16 Apr 2021 12:29:36 -0400 Received: from mx2.suse.de ([195.135.220.15]:47106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXRLR-0001eK-OT for qemu-devel@nongnu.org; Fri, 16 Apr 2021 12:29:36 -0400 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 93ED6B316; Fri, 16 Apr 2021 16:29:00 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC v14 76/80] target/arm: cpu64: rename arm_cpu_finalize_features Date: Fri, 16 Apr 2021 18:28:20 +0200 Message-Id: <20210416162824.25131-77-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210416162824.25131-1-cfontana@suse.de> References: <20210416162824.25131-1-cfontana@suse.de> MIME-Version: 1.0 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=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Roman Bolshakov , Claudio Fontana , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" also remove the now useless ifdef TARGET_AARCH64 from the function Signed-off-by: Claudio Fontana --- target/arm/cpu-sve.h | 2 +- target/arm/cpu.h | 2 +- target/arm/tcg/cpu-pauth.h | 2 +- target/arm/cpu.c | 2 +- target/arm/cpu64.c | 4 +--- target/arm/monitor.c | 4 ++-- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/target/arm/cpu-sve.h b/target/arm/cpu-sve.h index c83508ea0a..85078550bb 100644 --- a/target/arm/cpu-sve.h +++ b/target/arm/cpu-sve.h @@ -25,7 +25,7 @@ =20 #include "cpu.h" =20 -/* called by arm_cpu_finalize_features in realizefn */ +/* called by aarch64_cpu_finalize_features in realizefn */ bool cpu_sve_finalize_features(ARMCPU *cpu, Error **errp); =20 /* add the CPU SVE properties */ diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 236717ec71..dbbad48fda 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2110,7 +2110,7 @@ static inline int arm_feature(CPUARMState *env, int f= eature) return (env->features & (1ULL << feature)) !=3D 0; } =20 -void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp); +void aarch64_cpu_finalize_features(ARMCPU *cpu, Error **errp); =20 #if !defined(CONFIG_USER_ONLY) /* Return true if exception levels below EL3 are in secure state, diff --git a/target/arm/tcg/cpu-pauth.h b/target/arm/tcg/cpu-pauth.h index a0ef74dc77..b106b9cefc 100644 --- a/target/arm/tcg/cpu-pauth.h +++ b/target/arm/tcg/cpu-pauth.h @@ -25,7 +25,7 @@ =20 #include "cpu.h" =20 -/* called by arm_cpu_finalize_features in realizefn */ +/* called by aarch64_cpu_finalize_features in realizefn */ bool cpu_pauth_finalize(ARMCPU *cpu, Error **errp); =20 /* add the CPU Pointer Authentication properties */ diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 4d0724b537..fac297df4e 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -843,7 +843,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error *= *errp) } =20 #ifdef TARGET_AARCH64 - arm_cpu_finalize_features(cpu, &local_err); + aarch64_cpu_finalize_features(cpu, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); return; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index bcbfc5d53a..5b8dc8ff14 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -455,11 +455,10 @@ static gchar *aarch64_gdb_arch_name(CPUState *cs) return g_strdup("aarch64"); } =20 -void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp) +void aarch64_cpu_finalize_features(ARMCPU *cpu, Error **errp) { Error *local_err =3D NULL; =20 -#ifdef TARGET_AARCH64 if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { if (!cpu_sve_finalize_features(cpu, &local_err)) { error_propagate(errp, local_err); @@ -478,7 +477,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **err= p) } } } -#endif /* TARGET_AARCH64 */ =20 if (kvm_enabled()) { kvm_arm_steal_time_finalize(cpu, &local_err); diff --git a/target/arm/monitor.c b/target/arm/monitor.c index 95c1e72cd1..8a31c4dd04 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -186,7 +186,7 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(Cp= uModelExpansionType type, } #ifdef TARGET_AARCH64 if (!err) { - arm_cpu_finalize_features(ARM_CPU(obj), &err); + aarch64_cpu_finalize_features(ARM_CPU(obj), &err); } #endif /* TARGET_AARCH64 */ visit_end_struct(visitor, NULL); @@ -198,7 +198,7 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(Cp= uModelExpansionType type, } } else { #ifdef TARGET_AARCH64 - arm_cpu_finalize_features(ARM_CPU(obj), &error_abort); + aarch64_cpu_finalize_features(ARM_CPU(obj), &error_abort); #endif /* TARGET_AARCH64 */ } =20 --=20 2.26.2