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 62F37606A31A for ; Fri, 30 Oct 2026 07:32:06 +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=frhZzp6h Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xMh5X-0002ex-0L; Fri, 30 Oct 2026 03:31:47 -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 1xMh4V-0001bH-FH for qemu-arm@nongnu.org; Fri, 30 Oct 2026 03:30:53 -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 1xMh4U-0005QM-0L for qemu-arm@nongnu.org; Fri, 30 Oct 2026 03:30:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793345440; 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=6sWPcDbNjWSK4m62un68W2aSa9nPYNDYfPEb/+sW6n0=; b=frhZzp6h7GAj+fuCl3U7Hc4/qjevOb3VTTUIdBUp05ujlBHYCgmkoJlzSBuWoxCOu6hBs8 Oqf9Niqr7w7hdCztS1/9meR/IEeu/eJ73o++35c+ZXbUe+p6xq5aba019iZKuzEJBJPQMI REAKkivlZL8jaNFREZaDAJ6Sy9wj1eA= 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-464-lfT5WidcOEa8GZdSzJnmag-1; Fri, 30 Oct 2026 03:30:34 -0400 X-MC-Unique: lfT5WidcOEa8GZdSzJnmag-1 X-Mimecast-MFC-AGG-ID: lfT5WidcOEa8GZdSzJnmag_1793345432 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 63AF81955F61; Fri, 30 Oct 2026 07:30:32 +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 B1BA630001A4; Fri, 30 Oct 2026 07:30:27 +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 05/10] target/arm/kvm: Pass an error handle to kvm_arm_init_cpreg_list Date: Fri, 30 Oct 2026 08:28:46 +0100 Message-ID: <20261030072956.402425-6-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: rAkT3huNtetPtkXA-IjhvEDtYq6tHu2uehA2475dPiA_1793345432 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 Pass an error handle to kvm_arm_init_cpreg_list(). A Subsequent patch will do the same with kvm_arch_init_vcpu(). Signed-off-by: Eric Auger Reviewed-by: Gustavo Romero Reviewed-by: Sebastian Ott Reviewed-by: Peter Maydell --- target/arm/kvm.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 724bc08edf..76b3996d3b 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -865,6 +865,7 @@ static bool kvm_arm_reg_syncs_via_cpreg_list(uint64_t regidx) /** * kvm_arm_init_cpreg_list: * @cpu: ARMCPU + * @errp: Error handle * * Initialize the ARMCPU cpreg list according to the kernel's * definition of what CPU registers it knows about (and throw away @@ -872,7 +873,7 @@ static bool kvm_arm_reg_syncs_via_cpreg_list(uint64_t regidx) * * Returns: 0 if success, else < 0 error code */ -static int kvm_arm_init_cpreg_list(ARMCPU *cpu) +static int kvm_arm_init_cpreg_list(ARMCPU *cpu, Error **errp) { struct kvm_reg_list rl; struct kvm_reg_list *rlp; @@ -882,12 +883,17 @@ static int kvm_arm_init_cpreg_list(ARMCPU *cpu) rl.n = 0; ret = kvm_vcpu_ioctl(cs, KVM_GET_REG_LIST, &rl); if (ret != -E2BIG) { + if (ret < 0) { + error_setg_errno(errp, -ret, + "failed to get KVM register list size"); + } return ret; } rlp = g_malloc(sizeof(struct kvm_reg_list) + rl.n * sizeof(uint64_t)); rlp->n = rl.n; ret = kvm_vcpu_ioctl(cs, KVM_GET_REG_LIST, rlp); if (ret) { + error_setg_errno(errp, -ret, "failed to get KVM register list"); goto out; } /* Sort the list we get back from the kernel, since cpreg_tuples @@ -904,7 +910,7 @@ static int kvm_arm_init_cpreg_list(ARMCPU *cpu) case KVM_REG_SIZE_U64: break; default: - fprintf(stderr, "Can't handle size of register in kernel list\n"); + error_setg(errp, "Can't handle size of register in kernel list"); ret = -EINVAL; goto out; } @@ -930,7 +936,7 @@ static int kvm_arm_init_cpreg_list(ARMCPU *cpu) /* Shouldn't happen unless kernel is inconsistent about * what registers exist. */ - fprintf(stderr, "Initial read of kernel register state failed\n"); + error_setg(errp, "Initial read of kernel register state failed"); ret = -EINVAL; goto out; } @@ -2008,6 +2014,7 @@ int kvm_arch_init_vcpu(CPUState *cs) uint64_t mpidr; ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; + Error *local_err = NULL; uint64_t psciver; if (cpu->kvm_target == QEMU_KVM_ARM_TARGET_NONE) { @@ -2106,7 +2113,11 @@ int kvm_arch_init_vcpu(CPUState *cs) SET_IDREG(&cpu->isar, MPIDR, mpidr); cpu->mp_affinity = mpidr & ARM64_AFFINITY_MASK; - return kvm_arm_init_cpreg_list(cpu); + ret = kvm_arm_init_cpreg_list(cpu, &local_err); + if (ret < 0) { + error_report_err(local_err); + } + return ret; } int kvm_arch_destroy_vcpu(CPUState *cs) -- 2.53.0