From nobody Fri Nov 14 18:03:33 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1761044248; cv=none; d=zohomail.com; s=zohoarc; b=nm8gGSnrIZYJlxesATdBfwOViRhBUT2M/TtbZTjGZs+FKguySX/y7e4lu7HENpnQmyKQn3XnhDK0qjaNA0bc0lKYCNT+ukhLnbbFTgYdZf9/HWDn9EdoMVmo3uh1ahpm5n9APH5nMm6/xsdvMLADhW8JRG6hEvmVyJlkGDWM+5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761044248; h=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=VsPixCQuXr0a3YA1KwWnXXRiIgqzlv8MPMc2bZkj0yA=; b=LxxTUwraART/4ux/zqRQZ6ea/GYJCkUF8LxLy3oDxX9OGheY21fxxrV2kv11sI8NYn7rRz9bCsqr6IR5Up3Ox7P0tDqxhKI/px8c8LeWimuvzfSSPKN9I1Cy5zBhXKSoyUC4Jyq9UKJ+uH/SRkgjAC87wCiqaBgrMVFA0OzZfPs= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761044248588641.1610507124215; Tue, 21 Oct 2025 03:57:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBA2m-0006BE-12; Tue, 21 Oct 2025 06:56:44 -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 1vBA2K-0005jk-Ny; Tue, 21 Oct 2025 06:56:17 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBA2I-0001Z5-IB; Tue, 21 Oct 2025 06:56:16 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59L4RVMo014748; Tue, 21 Oct 2025 10:56:10 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v33f6jbq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Oct 2025 10:56:10 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 59LApUGq012143; Tue, 21 Oct 2025 10:56:09 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v33f6jbk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Oct 2025 10:56:09 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59L7BfSt017072; Tue, 21 Oct 2025 10:56:08 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49vnkxte14-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Oct 2025 10:56:08 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59LAu4XX42729756 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Oct 2025 10:56:04 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 71EFE20043; Tue, 21 Oct 2025 10:56:04 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C42062004D; Tue, 21 Oct 2025 10:56:01 +0000 (GMT) Received: from vishalc-ibm.ibm.com (unknown [9.39.24.196]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 21 Oct 2025 10:56:01 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=VsPixCQuXr0a3YA1K wWnXXRiIgqzlv8MPMc2bZkj0yA=; b=AT9aOm5ffcJR961Kp64BNpU+jDq6AQRXb RlgP5J4aqY3AJAfwTQGu21gIdwqZEqJsUjHJY4AI+FowU7QNCRImBb8PF0LfxgL+ 3h1gS6FMsI7yc4kSILXCaZISRhCRMXDXcrWv+3JO/Mv/GdJJXXj+MbUNTjJnP/Jt ctjYR1v2e6iG2sfJVKlBTHiWLYctDevi89JUOeYnSiAOPM9QqTpKu1ntIVclv/df cEzkOg1gGxp7k8rQtE8NULWw+SlF7I9nFR4CDlTaME8/uZoLYGKpajcFoy84N21z xEiSniwCeCd2IDFJ6M3m8hOOpMgTjzax8P2vmhyGQGpTPwFhD/vsw== From: Vishal Chourasia To: adityag@linux.ibm.com, harshpb@linux.ibm.com, milesg@linux.ibm.com, npiggin@gmail.com, peter.maydell@linaro.org, alistair23@gmail.com, balaton@eik.bme.hu, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, berrange@redhat.com Cc: Vishal Chourasia Subject: [Patch v5 4/6] hw/core: Pass errp to load_image_targphys_as() Date: Tue, 21 Oct 2025 16:24:43 +0530 Message-ID: <20251021105442.1474602-8-vishalc@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021105442.1474602-2-vishalc@linux.ibm.com> References: <20251021105442.1474602-2-vishalc@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=FMYWBuos c=1 sm=1 tr=0 ts=68f766ca cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=WwcbXC5amFkfT6oAP7YA:9 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-GUID: AhZsPAR1OyeQe53Sqc79PrgHAZifFCRt X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAyMiBTYWx0ZWRfX8EVhrNZNf/GJ kcbgoinVlD/iyTNAz5UMC9hIaHndEbX8kK6WNI/80EKjNQda1Hn0G+vSuQutbBsUo0mmZNk2by/ ljF5e66INTvewPta5PwLTLXywB2t3EU1odPvKG9QOuOCLuGLDjj0LayXBmdEC4RuBGjbwfdMCkG bAcOmoWIjbZbswT1v9yLDyJdK+MW0edFq8bDNOJK3M3ZgdBD0LQD7LzEiw4idQVkZe2O24LUJhs kU/EN8eOzYKGKvGE7KPC/OGDS31j/zIVZg4Ni0i6RpI2pAh0S3UoyhMDRF47XoXUUPgHEha5Y4L ZjdKvfnNpAdI/OTEg6GP1hkKpOS47CvYCxmbMsB/3WEKTh1dul+KPgZ2kHiluQfcx1DW2wxQGf+ IyRcmqH6hEDcCnV/13HZ19CUqK6hKA== X-Proofpoint-ORIG-GUID: lMO4SeermxWUCX0X_yp3hOz9BETCANKD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-21_01,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 priorityscore=1501 adultscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510180022 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=148.163.156.1; envelope-from=vishalc@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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 @ibm.com) X-ZM-MESSAGEID: 1761044250778154100 Content-Type: text/plain; charset="utf-8" Pass errp to load_image_targphys_as() in generic-loader and guest-loader to capture detailed error information from the loader functions. Use error_prepend() instead of error_setg() to preserve the underlying error details while adding context about which image failed to load. Signed-off-by: Vishal Chourasia --- hw/core/generic-loader.c | 7 ++++--- hw/core/guest-loader.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 6689847c33..35d4e5f4ea 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -60,6 +60,7 @@ static void generic_loader_reset(void *opaque) =20 static void generic_loader_realize(DeviceState *dev, Error **errp) { + ERRP_GUARD(); GenericLoaderState *s =3D GENERIC_LOADER(dev); hwaddr entry; ssize_t size =3D 0; @@ -149,13 +150,13 @@ static void generic_loader_realize(DeviceState *dev, = Error **errp) if (size < 0 || s->force_raw) { /* Default to the maximum size being the machine's ram size */ size =3D load_image_targphys_as(s->file, s->addr, - current_machine->ram_size, as, NULL); + current_machine->ram_size, as, errp); } else { s->addr =3D entry; } =20 - if (size < 0) { - error_setg(errp, "Cannot load specified image %s", s->file); + if (*errp) { + error_prepend(errp, "Cannot load specified image %s: ", s->fil= e); return; } } diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c index 59f325ad9c..dcbe8e4520 100644 --- a/hw/core/guest-loader.c +++ b/hw/core/guest-loader.c @@ -81,6 +81,7 @@ static void loader_insert_platform_data(GuestLoaderState = *s, int size, =20 static void guest_loader_realize(DeviceState *dev, Error **errp) { + ERRP_GUARD(); GuestLoaderState *s =3D GUEST_LOADER(dev); char *file =3D s->kernel ? s->kernel : s->initrd; int size =3D 0; @@ -101,9 +102,9 @@ static void guest_loader_realize(DeviceState *dev, Erro= r **errp) =20 /* Default to the maximum size being the machine's ram size */ size =3D load_image_targphys_as(file, s->addr, current_machine->ram_si= ze, - NULL, NULL); - if (size < 0) { - error_setg(errp, "Cannot load specified image %s", file); + NULL, errp); + if (*errp) { + error_prepend(errp, "Cannot load specified image %s: ", file); return; } =20 --=20 2.51.0