From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B0E4606A31A for ; Fri, 30 Oct 2026 07:32:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QxT9gDCy Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xMh5h-0003BE-Tc; Fri, 30 Oct 2026 03:32:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xMh4u-0001nd-0K for qemu-arm@nongnu.org; Fri, 30 Oct 2026 03:31:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xMh4s-0005ed-6Q for qemu-arm@nongnu.org; Fri, 30 Oct 2026 03:31:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793345464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jksgFsgQB4jJ3rmaoyYswgz76QPYC8LKhAdMUcMJw4c=; b=QxT9gDCypiVYH/I6cWTD7r6syAzVyRKj4R9n77+RCDy17obUNNQgRKy0eiG4A2e36knA8L ygjgVcCI37umoIjvM/MwmRyLM4lCRqoNpckXAk3Y06bwQNgGGLZchehb8b/aJQ7mecmiZP 9II0alNbPyinttKujQNVDYdguLLasnQ= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-596-vgpxkSI9NRyy3mE0p9dnVw-1; Fri, 30 Oct 2026 03:30:55 -0400 X-MC-Unique: vgpxkSI9NRyy3mE0p9dnVw-1 X-Mimecast-MFC-AGG-ID: vgpxkSI9NRyy3mE0p9dnVw_1793345453 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 192B21955F74; Fri, 30 Oct 2026 07:30:53 +0000 (UTC) Received: from laptop.redhat.corp (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 61FE730002C9; Fri, 30 Oct 2026 07:30:48 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, shaju.abraham@nutanix.com, khushit.shah@nutanix.com, richard.henderson@linaro.org, pbonzini@redhat.com, skolothumtho@nvidia.com, philmd@oss.qualcomm.com, 7746591750@163.com, maobibo@loongson.cn, harshpb@linux.ibm.com, amachhiw@linux.ibm.com, daniel.barboza@oss.qualcomm.com, milesg@linux.ibm.com, farman@linux.ibm.com, cohuck@redhat.com, alireza.sanaee@huawei.com Cc: armbru@redhat.com, mbawa@redhat.com Subject: [PATCH v3 for-11.2 09/10] target/arm: Directly store cpu probe failure error Date: Fri, 30 Oct 2026 08:28:50 +0100 Message-ID: <20261030072956.402425-10-eric.auger@redhat.com> In-Reply-To: <20261030072956.402425-1-eric.auger@redhat.com> References: <20261030072956.402425-1-eric.auger@redhat.com> X-Archived-By: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-MFC-PROC-ID: sXv6wg90bjR0Or5mxH-RdHtCssAdRlMVM_gZzhSnxfU_1793345453 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 In case *_arm_host_cpu_features() fails, we currently record that state in cpu->host_cpu_probe_failed to later report the error on realize(). Replace the boolean by an error handle to allow more precise error reports. Signed-off-by: Eric Auger Suggested-by: Peter Maydell --- target/arm/cpu.h | 5 +++-- target/arm/cpu.c | 9 +++++---- target/arm/hvf/hvf.c | 3 ++- target/arm/kvm.c | 24 +++++++++++------------- target/arm/whpx/whpx-all.c | 3 ++- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 5c5f551dac..dae79539b5 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1075,10 +1075,11 @@ struct ArchCPU { /* Uniprocessor system with MP extensions */ bool mp_is_up; - /* True if we tried kvm_arm_host_cpu_features() during CPU instance_init + /* + * Set if we tried *_set_cpu_features_from_host() during CPU instance_init * and the probe failed (so we need to report the error in realize) */ - bool host_cpu_probe_failed; + Error *host_cpu_probe_err; /* QOM property to indicate we should use the back-compat CNTFRQ default */ bool backcompat_cntfrq; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index aba45b66f8..67d48ebc07 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1838,12 +1838,13 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) * then it's possible that might have failed in the initfn, but * this is the first point where we can report it. */ - if (cpu->host_cpu_probe_failed) { + if (cpu->host_cpu_probe_err) { if (!kvm_enabled() && !hvf_enabled() && !whpx_enabled()) { - error_setg(errp, "The 'host' CPU type can only be used with KVM, HVF or WHPX"); - } else { - error_setg(errp, "Failed to retrieve host CPU features"); + error_append_hint(&cpu->host_cpu_probe_err, + "The 'host' CPU type can only be used with KVM, HVF or WHPX\n"); } + error_propagate(errp, cpu->host_cpu_probe_err); + cpu->host_cpu_probe_err = NULL; return; } diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 4b947e9ba5..2f2a46644d 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1287,7 +1287,8 @@ void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu) * We can't report this error yet, so flag that we need to * in arm_cpu_realizefn(). */ - cpu->host_cpu_probe_failed = true; + error_setg(&cpu->host_cpu_probe_err, + "failed to retrieve host CPU features"); return; } } diff --git a/target/arm/kvm.c b/target/arm/kvm.c index b4b20c5dc2..fc9551411e 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -312,7 +312,7 @@ static uint32_t kvm_arm_sve_get_vls(int fd) return vls[0] & MAKE_64BIT_MASK(0, ARM_MAX_VQ); } -static void kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) +static bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) { /* Identify the feature bits corresponding to the host CPU, and * fill out the ARMHostCPUClass fields accordingly. To do this @@ -330,7 +330,7 @@ static void kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) ahcf->dtb_compatible = "arm,armv8"; if (!kvm_enabled()) { - return; + return false; } /* @@ -372,7 +372,7 @@ static void kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) } if (!kvm_arm_create_scratch_host_vcpu(fdarray, &init)) { - return; + return false; } int fd = fdarray[2]; @@ -502,7 +502,7 @@ static void kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) kvm_arm_destroy_scratch_host_vcpu(fdarray); if (err < 0) { - return; + return false; } /* @@ -521,27 +521,25 @@ static void kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) ahcf->target = init.target; ahcf->features = features; + return true; } void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) { CPUARMState *env = &cpu->env; + static bool probe_ok; if (!arm_host_cpu_features.dtb_compatible) { - kvm_arm_get_host_cpu_features(&arm_host_cpu_features); + probe_ok = kvm_arm_get_host_cpu_features(&arm_host_cpu_features); } - cpu->kvm_target = arm_host_cpu_features.target; - - if (cpu->kvm_target == QEMU_KVM_ARM_TARGET_NONE) { - /* - * We can't report this error yet, so flag that we need to - * in arm_cpu_realizefn(). - */ - cpu->host_cpu_probe_failed = true; + if (!probe_ok) { + error_setg(&cpu->host_cpu_probe_err, + "failed to retrieve host CPU features"); return; } + cpu->kvm_target = arm_host_cpu_features.target; cpu->dtb_compatible = arm_host_cpu_features.dtb_compatible; cpu->isar = arm_host_cpu_features.isar; cpu->sve_vq.supported = arm_host_cpu_features.sve_vq_supported; diff --git a/target/arm/whpx/whpx-all.c b/target/arm/whpx/whpx-all.c index 024d18df04..ded42c980b 100644 --- a/target/arm/whpx/whpx-all.c +++ b/target/arm/whpx/whpx-all.c @@ -767,7 +767,8 @@ void whpx_arm_set_cpu_features_from_host(ARMCPU *cpu) * We can't report this error yet, so flag that we need to * in arm_cpu_realizefn(). */ - cpu->host_cpu_probe_failed = true; + error_setg(&cpu->host_cpu_probe_err, + "failed to retrieve host CPU features"); return; } } -- 2.53.0