From nobody Mon Oct 27 11:10:16 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=1761311264; cv=none; d=zohomail.com; s=zohoarc; b=Yv/gvv6+OiRPsaWvNWgnpTpYWVuY95+vjVatL5B2i+cmszehKeFjdekp1x8UCeMPaYiiHkJCFDKFv03ilX58xC/pgg70+9lL+ogEi62453ymX6UACPl/ZOT+kIIYZldAEdyfKRYH2mUNj16NDSE5i3NEMVNOkul9QRmcIuGVZtI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761311264; 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=2LsQcov6x2Z/izCgrORwrUhluTQa7gAA/6S5Q51tFB0=; b=cAZ6hNo/C4UcHNJnP++LhLhHFY4gRuaJTIh2z1FlHCPmAjGo+ePCxRkwRiWPHz7h4CPrIX0NBlucefJGE6Ywq2+x7kPQvlrUfZRNfAb6scTMlY3et/hFFb+nNZnShtY3LuB/FQtyiXY3UVphX0TVwP9caTH1+OEqhXgq6P1n66s= 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 1761311263983173.15259891527273; Fri, 24 Oct 2025 06:07:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCHVB-0007Nx-7n; Fri, 24 Oct 2025 09:06:41 -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 1vCHV4-0007N0-7V; Fri, 24 Oct 2025 09:06:34 -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 1vCHV1-0002uD-KO; Fri, 24 Oct 2025 09:06:33 -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 59O7vAhD030597; Fri, 24 Oct 2025 13:06:27 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v33fqdhu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:27 +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 59OD24rm011617; Fri, 24 Oct 2025 13:06:26 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 49v33fqdhn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:26 +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 59O95TBc017066; Fri, 24 Oct 2025 13:06:25 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49vnkyba3a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:25 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59OD6LlA57082232 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Oct 2025 13:06:21 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 883142004D; Fri, 24 Oct 2025 13:06:21 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 82ED220040; Fri, 24 Oct 2025 13:06:18 +0000 (GMT) Received: from vishalc-ibm.ibm.com (unknown [9.39.24.189]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 24 Oct 2025 13:06:17 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=2LsQco v6x2Z/izCgrORwrUhluTQa7gAA/6S5Q51tFB0=; b=aNDcOUrTJfdCAoxuOnS+np H9vtqJOghdAhkSel1m0evE7J6X3LBd0I9SFc1vpXvPmks5mY7+Iu6xlIatR16BTu pBIY0ISzXbV4MNp1z7aFGXmRsMPQ79cFKKW1LSfpbHHX8RQCUgl7w37T38xyrCj7 kC2PdUE0vum2Wg8+8pgDaT8eCa0UYnxu8BS5b7Xmn5tvUk/3vWuU0YTZr+limMfG hjuRzhhcbd6vwvOzh5cXZETuuIohCmYnLTWwCfA1kRTisUtw4YN7EbkXVZxfNZwM UhIjDxNwaVC6a8RZB9rgJSPMyzT80dPWTO7SwvDMw8uWDBUcbuQaEh9fgOqx06HQ == 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [Patch v10 1/6] core/loader: Use qemu_open() instead of open() in get_image_size() Date: Fri, 24 Oct 2025 18:35:53 +0530 Message-ID: <20251024130556.1942835-4-vishalc@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251024130556.1942835-2-vishalc@linux.ibm.com> References: <20251024130556.1942835-2-vishalc@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=68fb79d3 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=20KFwNOVAAAA:8 a=KKAkSRfTAAAA:8 a=VnNF1IyMAAAA:8 a=-CUL7ttSjCJlytmGOe4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-GUID: Vij0OXQUsON1e3Sh6zIrGkTNfNLLx9AL X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAyMiBTYWx0ZWRfX8MpJ53ew01vl BuLwCsVPbcPYsJx6Rnou1GMXBkEcqUTIXjO3HUckn1Lii//0GckGJfFLt30raI9z+Y6HUTkt/Ef 1jrIFYg8SEXTfOnzIYuRuewsmzvoTYsjR9y/oJLKxuP9fPqwsNHh7NwPpLJfyb+ZfdEciaL6x0N MwS5GWRFv2ed4NQ+1z8hV4hu/zWBMnVqI6AfG6d+zU4XUuv+RuV0KiwSYyt+BhNbww0ztIO7I6M UFCdggb6j9P9esOQ4px/wsWJXuGUQvK8Bl7Mfd2tfj3YUA2E4GUwb5xmtQAlBjeWxD5iBN49lJX qZfrLmzAVnS85CJ2RwmRIXZfgzq3breg+BK9eqagJbBD0JW/7yWn+NO5EgT1VQMZQUnYhl69y7A CTETV2NG+++KpVbFzcFYn/AuSPeXeQ== X-Proofpoint-ORIG-GUID: 2Lv1DiGd3jbcpow1fi2QAVhox54Zzsve 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-24_02,2025-10-22_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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1761311266594158500 Replace open() with qemu_open() which provides better error handling via the Error object, automatically sets O_CLOEXEC, and supports FD passing with /dev/fdset. Currently pass errp argument as NULL. Suggested-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Vishal Chourasia --- hw/core/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 477661a025..c9782d67e8 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -74,7 +74,7 @@ int64_t get_image_size(const char *filename) { int fd; int64_t size; - fd =3D open(filename, O_RDONLY | O_BINARY); + fd =3D qemu_open(filename, O_RDONLY | O_BINARY, NULL); if (fd < 0) return -1; size =3D lseek(fd, 0, SEEK_END); --=20 2.51.0 From nobody Mon Oct 27 11:10:16 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=1761311295; cv=none; d=zohomail.com; s=zohoarc; b=R2lLzKifZFQidU+0nDWQo0eZPg2EfEuFuEiETysV7OfWJ6fFDQZvxPlXAdXL36XdkM0CeKsKvxa0CaEk/lVnEPUNxBp1mnr9Mv/uV5c1sgv35dUUu77BwZIXdxJhzC78iU4IpqnltOTt9ZdFyIF5oNjMkYtOz08xgOc1Ac9tRLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761311295; 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=2Ifv/F9vHTbnrQqxh6Qozlw/gQlVqo1jd4fNdKwGxQM=; b=gh5GJDQ/2bOISiCH+yWjbYowijplMjsNLlZN5RBfd0cbGdTcn8itAre468bmIPikIfI/1I1xnv9gpq9uKL99Q/sMUyU2io667iVOCh5DRp4/PjSHCTTGPJgygdCDZDrFjzqZkB7eTC6qhYlVk41DW/HfeL1XlOOrIoR0V+SAxfQ= 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 1761311295487323.28117391252397; Fri, 24 Oct 2025 06:08:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCHVa-0007Y3-LG; Fri, 24 Oct 2025 09:07:06 -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 1vCHVZ-0007XA-18; Fri, 24 Oct 2025 09:07:05 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vCHVU-0002vy-JL; Fri, 24 Oct 2025 09:07:04 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59OADD0s000322; Fri, 24 Oct 2025 13:06:42 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v32hwrag-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:42 +0000 (GMT) Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 59OCsi5n031680; Fri, 24 Oct 2025 13:06:41 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v32hwrac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:41 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59OAlLUZ002306; Fri, 24 Oct 2025 13:06:40 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 49vqejtytr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:40 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59OD6abJ20775522 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Oct 2025 13:06:36 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 29B8C20043; Fri, 24 Oct 2025 13:06:36 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8A77620040; Fri, 24 Oct 2025 13:06:29 +0000 (GMT) Received: from vishalc-ibm.ibm.com (unknown [9.39.24.189]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 24 Oct 2025 13:06:29 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=2Ifv/F 9vHTbnrQqxh6Qozlw/gQlVqo1jd4fNdKwGxQM=; b=Vr0EmfZslM2+KAACdHtX3o 45gq59i+GGho/lyHHPRurhJCWvAJEXFOFuVTYzUP4Bugrr7/40sIfz/VaoGXkcP2 RGeYqKQrAlWQTh3Q0w/WkFRrn6+XCTtZc6T/O+B62gNvXl+ydFecIXdAJQU8UOND EQAG9uDdyDnuqzC2tVCmuE9QRI+9w7NJyjiCX6VQh/YRid/g7+bnk1/3ZFn/HtzI KT+C33IvilAK1/mjZQoUZ7gZNaN3qUZbTasOj2WYPcJ3be26K2wAxkIyRaGpWbTr 5GF/PKxBLpyNy25U8TFXsZNuwfjKCbaPyZow+Y/Cc8a0f+gB9uA1WbBOOrT7RoFA == 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, richard.henderson@linaro.org, alistair@alistair23.me, alex.bennee@linaro.org, deller@gmx.de, pbonzini@redhat.com, eduardo@habkost.net, minyard@acm.org, gaosong@loongson.cn, maobibo@loongson.cn, laurent@vivier.eu, edgar.iglesias@gmail.com, hpoussin@reactos.org, david@redhat.com, chigot@adacore.com, konrad.frederic@yahoo.fr, atar4qemu@gmail.com, jcmvbkbc@gmail.com Cc: Vishal Chourasia , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [Patch v10 2/6] core/loader: capture Error from load_image_targphys Date: Fri, 24 Oct 2025 18:35:55 +0530 Message-ID: <20251024130556.1942835-6-vishalc@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251024130556.1942835-2-vishalc@linux.ibm.com> References: <20251024130556.1942835-2-vishalc@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAyMiBTYWx0ZWRfX41Enl12DMjG7 MFw6FL9XKVHv1GopkZkRUOdp5boo3nyMTqoMlb248qbTjHu1u+FA/B9BBuXm+6KtqAOs/pQbSR7 eUa3sQ16D4M23+J5hpY/a2xS4gj5UrP2suOFoHdjEoEqpyGh/FrBnpvbTI1PqOm4+u4wd10sn2Q ttUdybeqkCgPnEgHmxoTUSsuyBcWv48YZQQrDv1ZO0bp70xMohCNuxrVykPoXfhlaHpHRn2r+BS gROIWrl3Bk6Q7jsLcEAwp9XvYFhhg0L7mKv/amVr7EUbh3oMGWvsToonrKTu6WCxqnd+WnrBj8x UGkCPvpqfXsd0NYuXR3n34okt2JSacKJKYaRvEKueyBQ2lBLcTfhJS+U9ospIzvvDf7mMqKX8P1 NWCu4Q8/U0PTJlNSj3vFX++X46V5pg== X-Authority-Analysis: v=2.4 cv=OrVCCi/t c=1 sm=1 tr=0 ts=68fb79e2 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=VnNF1IyMAAAA:8 a=hlRM6ndKHY0ngbLpl6IA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-GUID: lrPFthn2Xpu9GwhHwd_Vs8icsKAhYBa2 X-Proofpoint-ORIG-GUID: YjleTka8W4j1ldPwvyjwofKORG2oGTkO 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-24_02,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 priorityscore=1501 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=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.158.5; envelope-from=vishalc@linux.ibm.com; helo=mx0b-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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1761311297624158500 Add Error **errp parameter to load_image_targphys(), load_image_targphys_as(), and get_image_size() to enable better error reporting when image loading fails. Pass NULL for errp in all existing call sites to maintain current behavior. No functional change intended in this patch. Suggested-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aditya Gupta Tested-by: Aditya Gupta Signed-off-by: Vishal Chourasia --- hw/alpha/dp264.c | 4 ++-- hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 5 +++-- hw/arm/digic_boards.c | 2 +- hw/arm/highbank.c | 3 ++- hw/arm/raspi.c | 2 +- hw/arm/vexpress.c | 2 +- hw/core/generic-loader.c | 3 ++- hw/core/guest-loader.c | 2 +- hw/core/loader.c | 16 +++++++++------- hw/hppa/machine.c | 5 +++-- hw/i386/multiboot.c | 2 +- hw/i386/x86-common.c | 4 ++-- hw/ipmi/ipmi_bmc_sim.c | 2 +- hw/loongarch/boot.c | 5 ++--- hw/m68k/an5206.c | 2 +- hw/m68k/mcf5208.c | 4 ++-- hw/m68k/next-cube.c | 2 +- hw/m68k/q800.c | 7 ++++--- hw/m68k/virt.c | 4 ++-- hw/microblaze/boot.c | 5 +++-- hw/mips/boston.c | 2 +- hw/mips/fuloong2e.c | 9 +++++---- hw/mips/jazz.c | 2 +- hw/mips/loongson3_virt.c | 10 ++++++---- hw/mips/malta.c | 9 +++++---- hw/nubus/nubus-device.c | 2 +- hw/openrisc/boot.c | 5 +++-- hw/pci/pci.c | 2 +- hw/ppc/amigaone.c | 4 ++-- hw/ppc/e500.c | 5 +++-- hw/ppc/mac_newworld.c | 9 ++++++--- hw/ppc/mac_oldworld.c | 9 ++++++--- hw/ppc/pegasos2.c | 5 +++-- hw/ppc/pnv.c | 9 ++++++--- hw/ppc/ppc440_bamboo.c | 3 ++- hw/ppc/prep.c | 8 +++++--- hw/ppc/sam460ex.c | 3 ++- hw/ppc/spapr.c | 8 ++++---- hw/ppc/virtex_ml507.c | 5 +++-- hw/riscv/boot.c | 7 ++++--- hw/rx/rx-gdbsim.c | 2 +- hw/s390x/ipl.c | 8 +++++--- hw/sh4/r2d.c | 8 +++++--- hw/smbios/smbios.c | 2 +- hw/sparc/leon3.c | 4 ++-- hw/sparc/sun4m.c | 8 +++++--- hw/sparc64/sun4u.c | 7 ++++--- hw/xtensa/xtfpga.c | 3 ++- include/hw/loader.h | 8 +++++--- system/device_tree.c | 2 +- 51 files changed, 145 insertions(+), 106 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 19562b5967..b6155646ef 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -182,7 +182,7 @@ static void clipper_init(MachineState *machine) long initrd_base; int64_t initrd_size; =20 - initrd_size =3D get_image_size(initrd_filename); + initrd_size =3D get_image_size(initrd_filename, NULL); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -192,7 +192,7 @@ static void clipper_init(MachineState *machine) /* Put the initrd image as high in memory as possible. */ initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base); + ram_size - initrd_base, NULL); =20 address_space_stq(&address_space_memory, param_offset + 0x100, initrd_base + 0xfffffc0000000000ULL, diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index cea3eb49ee..c4a9c3ac52 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -611,7 +611,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel= _filename, NULL, ELFDATA2LSB, EM_ARM, 1, 0, as); if (image_size < 0) { image_size =3D load_image_targphys_as(kernel_filename, mem_bas= e, - mem_size, as); + mem_size, as, NULL); } if (image_size < 0) { error_report("Could not load kernel '%s'", kernel_filename); diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e77d8679d8..b91660208f 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -964,7 +964,8 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, /* 32-bit ARM */ entry =3D info->loader_start + KERNEL_LOAD_ADDR; kernel_size =3D load_image_targphys_as(info->kernel_filename, entr= y, - ram_end - KERNEL_LOAD_ADDR, a= s); + ram_end - KERNEL_LOAD_ADDR, a= s, + NULL); is_linux =3D 1; if (kernel_size >=3D 0) { image_low_addr =3D entry; @@ -1025,7 +1026,7 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, info->initrd_start, ram_end - info->initrd_start, - as); + as, NULL); } if (initrd_size < 0) { error_report("could not load initrd '%s'", diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 466b8b84c0..de56991bac 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -97,7 +97,7 @@ static void digic_load_rom(DigicState *s, hwaddr addr, exit(1); } =20 - rom_size =3D load_image_targphys(fn, addr, max_size); + rom_size =3D load_image_targphys(fn, addr, max_size, NULL); if (rom_size < 0 || rom_size > max_size) { error_report("Couldn't load rom image '%s'.", filename); exit(1); diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 165c0b741a..ff987467a9 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -235,7 +235,8 @@ static void calxeda_init(MachineState *machine, enum cx= machines machine_id) if (machine->firmware !=3D NULL) { sysboot_filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->= firmware); if (sysboot_filename !=3D NULL) { - if (load_image_targphys(sysboot_filename, 0xfff88000, 0x8000) = < 0) { + if (load_image_targphys(sysboot_filename, 0xfff88000, 0x8000, + NULL) < 0) { error_report("Unable to load %s", machine->firmware); exit(1); } diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 9d9af63d65..fbf3e09c03 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -230,7 +230,7 @@ static void setup_boot(MachineState *machine, ARMCPU *c= pu, ? FIRMWARE_ADDR_2 : FIRMWARE_ADDR_3; /* load the firmware image (typically kernel.img) */ r =3D load_image_targphys(machine->firmware, firmware_addr, - ram_size - firmware_addr); + ram_size - firmware_addr, NULL); if (r < 0) { error_report("Failed to load firmware from %s", machine->firmw= are); exit(1); diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 35f8d05ea1..60cd375fe7 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -578,7 +578,7 @@ static void vexpress_common_init(MachineState *machine) exit(1); } image_size =3D load_image_targphys(fn, map[VE_NORFLASH0], - VEXPRESS_FLASH_SIZE); + VEXPRESS_FLASH_SIZE, NULL); g_free(fn); if (image_size < 0) { error_report("Could not load ROM image '%s'", machine->firmwar= e); diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index e72bbde2a2..6689847c33 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -148,7 +148,8 @@ static void generic_loader_realize(DeviceState *dev, Er= ror **errp) =20 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_mach= ine->ram_size, as); + size =3D load_image_targphys_as(s->file, s->addr, + current_machine->ram_size, as, NULL); } else { s->addr =3D entry; } diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c index 3db89d7a2e..59f325ad9c 100644 --- a/hw/core/guest-loader.c +++ b/hw/core/guest-loader.c @@ -101,7 +101,7 @@ 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, NULL); if (size < 0) { error_setg(errp, "Cannot load specified image %s", file); return; diff --git a/hw/core/loader.c b/hw/core/loader.c index c9782d67e8..7aca4989ef 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -48,6 +48,7 @@ #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" #include "qapi/type-helpers.h" +#include "qemu/units.h" #include "trace.h" #include "hw/hw.h" #include "disas/disas.h" @@ -70,11 +71,11 @@ static int roms_loaded; =20 /* return the size or -1 if error */ -int64_t get_image_size(const char *filename) +int64_t get_image_size(const char *filename, Error **errp) { int fd; int64_t size; - fd =3D qemu_open(filename, O_RDONLY | O_BINARY, NULL); + fd =3D qemu_open(filename, O_RDONLY | O_BINARY, errp); if (fd < 0) return -1; size =3D lseek(fd, 0, SEEK_END); @@ -118,18 +119,19 @@ ssize_t read_targphys(const char *name, } =20 ssize_t load_image_targphys(const char *filename, - hwaddr addr, uint64_t max_sz) + hwaddr addr, uint64_t max_sz, Error **errp) { - return load_image_targphys_as(filename, addr, max_sz, NULL); + return load_image_targphys_as(filename, addr, max_sz, NULL, errp); } =20 /* return the size or -1 if error */ ssize_t load_image_targphys_as(const char *filename, - hwaddr addr, uint64_t max_sz, AddressSpace = *as) + hwaddr addr, uint64_t max_sz, AddressSpace = *as, + Error **errp) { ssize_t size; =20 - size =3D get_image_size(filename); + size =3D get_image_size(filename, errp); if (size < 0 || size > max_sz) { return -1; } @@ -150,7 +152,7 @@ ssize_t load_image_mr(const char *filename, MemoryRegio= n *mr) return -1; } =20 - size =3D get_image_size(filename); + size =3D get_image_size(filename, NULL); =20 if (size < 0 || size > memory_region_size(mr)) { return -1; diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index cddca69b93..ba894f8b1e 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -495,7 +495,7 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, ram_addr_t initrd_base; int64_t initrd_size; =20 - initrd_size =3D get_image_size(initrd_filename); + initrd_size =3D get_image_size(initrd_filename, NULL); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -516,7 +516,8 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, exit(1); } =20 - load_image_targphys(initrd_filename, initrd_base, initrd_size); + load_image_targphys(initrd_filename, initrd_base, initrd_size, + NULL); cpu[0]->env.initrd_base =3D initrd_base; cpu[0]->env.initrd_end =3D initrd_base + initrd_size; } diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 6e6b96bc34..78690781b7 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -337,7 +337,7 @@ int load_multiboot(X86MachineState *x86ms, *next_space =3D '\0'; } mb_debug("multiboot loading module: %s", one_file); - mb_mod_length =3D get_image_size(one_file); + mb_mod_length =3D get_image_size(one_file, NULL); if (mb_mod_length < 0) { error_report("Failed to open file '%s'", one_file); exit(1); diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index 7512be64d6..6e78f3d07d 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -924,7 +924,7 @@ void x86_load_linux(X86MachineState *x86ms, exit(1); } =20 - dtb_size =3D get_image_size(dtb_filename); + dtb_size =3D get_image_size(dtb_filename, NULL); if (dtb_size <=3D 0) { fprintf(stderr, "qemu: error reading dtb %s: %s\n", dtb_filename, strerror(errno)); @@ -1025,7 +1025,7 @@ void x86_bios_rom_init(X86MachineState *x86ms, const = char *default_firmware, bios_name =3D MACHINE(x86ms)->firmware ?: default_firmware; filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (filename) { - bios_size =3D get_image_size(filename); + bios_size =3D get_image_size(filename, NULL); } else { bios_size =3D -1; } diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 04e1dcd0e7..4604d632b1 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -2211,7 +2211,7 @@ static void ipmi_fru_init(IPMIFru *fru) goto out; } =20 - fsize =3D get_image_size(fru->filename); + fsize =3D get_image_size(fru->filename, NULL); if (fsize > 0) { size =3D QEMU_ALIGN_UP(fsize, fru->areasize); fru->data =3D g_malloc0(size); diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index 3dd48cb8aa..8857a04998 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -328,14 +328,13 @@ static int64_t load_kernel_info(struct loongarch_boot= _info *info) } =20 if (info->initrd_filename) { - ssize_t initrd_size =3D get_image_size(info->initrd_filename); - + ssize_t initrd_size =3D get_image_size(info->initrd_filename, NULL= ); if (initrd_size > 0) { initrd_offset =3D ROUND_UP(kernel_high + 4 * kernel_size, 64 *= KiB); initrd_offset =3D alloc_initrd_memory(info, initrd_offset, initrd_size); initrd_size =3D load_image_targphys(info->initrd_filename, - initrd_offset, initrd_size); + initrd_offset, initrd_size, = NULL); } =20 if (initrd_size =3D=3D -1) { diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index d97399b882..ff21d7779e 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -82,7 +82,7 @@ static void an5206_init(MachineState *machine) } if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, KERNEL_LOAD_A= DDR, - ram_size - KERNEL_LOAD_ADDR); + ram_size - KERNEL_LOAD_ADDR, NUL= L); entry =3D KERNEL_LOAD_ADDR; } if (kernel_size < 0) { diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 75cc076f78..4a585b231d 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -351,7 +351,7 @@ static void mcf5208evb_init(MachineState *machine) error_report("Could not find ROM image '%s'", machine->firmwar= e); exit(1); } - if (load_image_targphys(fn, 0x0, ROM_SIZE) < 8) { + if (load_image_targphys(fn, 0x0, ROM_SIZE, NULL) < 8) { error_report("Could not load ROM image '%s'", machine->firmwar= e); exit(1); } @@ -380,7 +380,7 @@ static void mcf5208evb_init(MachineState *machine) } if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, 0x40000000, - ram_size); + ram_size, NULL); entry =3D 0x40000000; } if (kernel_size < 0) { diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 957644b2d1..cfb2b319e5 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -1325,7 +1325,7 @@ static void next_cube_init(MachineState *machine) memory_region_init_alias(&m->rom2, NULL, "next.rom2", &m->rom, 0x0, 0x20000); memory_region_add_subregion(sysmem, 0x0, &m->rom2); - if (load_image_targphys(bios_name, 0x01000000, 0x20000) < 8) { + if (load_image_targphys(bios_name, 0x01000000, 0x20000, NULL) < 8) { if (!qtest_enabled()) { error_report("Failed to load firmware '%s'.", bios_name); } diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 793b23f815..b8676feb41 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -629,7 +629,7 @@ static void q800_machine_init(MachineState *machine) =20 /* load initrd */ if (initrd_filename) { - initrd_size =3D get_image_size(initrd_filename); + initrd_size =3D get_image_size(initrd_filename, NULL); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -638,7 +638,7 @@ static void q800_machine_init(MachineState *machine) =20 initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base); + ram_size - initrd_base, NULL); BOOTINFO2(param_ptr, BI_RAMDISK, initrd_base, initrd_size); } else { @@ -668,7 +668,8 @@ static void q800_machine_init(MachineState *machine) =20 /* Load MacROM binary */ if (filename) { - bios_size =3D load_image_targphys(filename, MACROM_ADDR, MACRO= M_SIZE); + bios_size =3D load_image_targphys(filename, MACROM_ADDR, MACRO= M_SIZE, + NULL); g_free(filename); } else { bios_size =3D -1; diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 98cfe43c73..3f65d91556 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -283,7 +283,7 @@ static void virt_init(MachineState *machine) =20 /* load initrd */ if (initrd_filename) { - initrd_size =3D get_image_size(initrd_filename); + initrd_size =3D get_image_size(initrd_filename, NULL); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -292,7 +292,7 @@ static void virt_init(MachineState *machine) =20 initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base); + ram_size - initrd_base, NULL); BOOTINFO2(param_ptr, BI_RAMDISK, initrd_base, initrd_size); } else { diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 4a9c9df318..ec38107f50 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -170,7 +170,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is= _little_endian, /* Not an ELF image nor an u-boot image, try a RAW image. */ if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, ddr_base, - ramsize); + ramsize, NULL); boot_info.bootstrap_pc =3D ddr_base; high =3D (ddr_base + kernel_size + 3) & ~3; } @@ -189,7 +189,8 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is= _little_endian, if (initrd_size < 0) { initrd_size =3D load_image_targphys(initrd_filename, boot_info.initrd_start, - ramsize - initrd_offset); + ramsize - initrd_offset, + NULL); } if (initrd_size < 0) { error_report("could not load initrd '%s'", diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 149a263bd5..0a3a827b5f 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -778,7 +778,7 @@ static void boston_mach_init(MachineState *machine) =20 if (machine->firmware) { fw_size =3D load_image_targphys(machine->firmware, - 0x1fc00000, 4 * MiB); + 0x1fc00000, 4 * MiB, NULL); if (fw_size =3D=3D -1) { error_report("unable to load firmware image '%s'", machine->firmware); diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 2a8507b8b0..5fe40eee65 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -118,7 +118,7 @@ static uint64_t load_kernel(MIPSCPU *cpu) initrd_size =3D 0; initrd_offset =3D 0; if (loaderparams.initrd_filename) { - initrd_size =3D get_image_size(loaderparams.initrd_filename); + initrd_size =3D get_image_size(loaderparams.initrd_filename, NULL); if (initrd_size > 0) { initrd_offset =3D ROUND_UP(kernel_high, INITRD_PAGE_SIZE); if (initrd_offset + initrd_size > loaderparams.ram_size) { @@ -127,8 +127,9 @@ static uint64_t load_kernel(MIPSCPU *cpu) exit(1); } initrd_size =3D load_image_targphys(loaderparams.initrd_filena= me, - initrd_offset, - loaderparams.ram_size - init= rd_offset); + initrd_offset, + loaderparams.ram_size - initrd_of= fset, + NULL); } if (initrd_size =3D=3D (target_ulong) -1) { error_report("could not load initial ram disk '%s'", @@ -264,7 +265,7 @@ static void mips_fuloong2e_init(MachineState *machine) machine->firmware ?: FULOONG_BIOSNAME); if (filename) { bios_size =3D load_image_targphys(filename, 0x1fc00000LL, - BIOS_SIZE); + BIOS_SIZE, NULL); g_free(filename); } else { bios_size =3D -1; diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 7fb0b97a38..1d6bdc0091 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -245,7 +245,7 @@ static void mips_jazz_init(MachineState *machine, machine->firmware ?: bios_name); if (filename) { bios_size =3D load_image_targphys(filename, 0xfff00000LL, - MAGNUM_BIOS_SIZE); + MAGNUM_BIOS_SIZE, NULL); g_free(filename); } else { bios_size =3D -1; diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 672083dec9..77dc895648 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -371,7 +371,7 @@ static uint64_t load_kernel(CPUMIPSState *env) initrd_size =3D 0; initrd_offset =3D 0; if (loaderparams.initrd_filename) { - initrd_size =3D get_image_size(loaderparams.initrd_filename); + initrd_size =3D get_image_size(loaderparams.initrd_filename, NULL); if (initrd_size > 0) { initrd_offset =3D MAX(loader_memmap[LOADER_INITRD].base, ROUND_UP(kernel_high, INITRD_PAGE_SIZE)); @@ -383,8 +383,9 @@ static uint64_t load_kernel(CPUMIPSState *env) } =20 initrd_size =3D load_image_targphys(loaderparams.initrd_filena= me, - initrd_offset, - loaderparams.ram_size - init= rd_offset); + initrd_offset, + loaderparams.ram_size - initrd_off= set, + NULL); } =20 if (initrd_size =3D=3D (target_ulong) -1) { @@ -650,7 +651,8 @@ static void mips_loongson3_virt_init(MachineState *mach= ine) if (filename) { bios_size =3D load_image_targphys(filename, virt_memmap[VIRT_BIOS_ROM].bas= e, - virt_memmap[VIRT_BIOS_ROM].siz= e); + virt_memmap[VIRT_BIOS_ROM].siz= e, + NULL); g_free(filename); } else { bios_size =3D -1; diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 02da629b5a..806e8d5078 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -892,7 +892,7 @@ static uint64_t load_kernel(void) initrd_size =3D 0; initrd_offset =3D 0; if (loaderparams.initrd_filename) { - initrd_size =3D get_image_size(loaderparams.initrd_filename); + initrd_size =3D get_image_size(loaderparams.initrd_filename, NULL); if (initrd_size > 0) { /* * The kernel allocates the bootmap memory in the low memory a= fter @@ -908,8 +908,9 @@ static uint64_t load_kernel(void) exit(1); } initrd_size =3D load_image_targphys(loaderparams.initrd_filena= me, - initrd_offset, - loaderparams.ram_size - init= rd_offset); + initrd_offset, + loaderparams.ram_size - initrd_off= set, + NULL); } if (initrd_size =3D=3D (target_ulong) -1) { error_report("could not load initial ram disk '%s'", @@ -1176,7 +1177,7 @@ void mips_malta_init(MachineState *machine) machine->firmware ?: bios_name); if (filename) { bios_size =3D load_image_targphys(filename, FLASH_ADDRESS, - BIOS_SIZE); + BIOS_SIZE, NULL); g_free(filename); } else { bios_size =3D -1; diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c index 7797e61c7f..0d4d6c0d87 100644 --- a/hw/nubus/nubus-device.c +++ b/hw/nubus/nubus-device.c @@ -68,7 +68,7 @@ static void nubus_device_realize(DeviceState *dev, Error = **errp) path =3D g_strdup(nd->romfile); } =20 - size =3D get_image_size(path); + size =3D get_image_size(path, NULL); if (size < 0) { error_setg(errp, "failed to find romfile \"%s\"", nd->romfile); g_free(path); diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c index c81efe8138..db6fea071e 100644 --- a/hw/openrisc/boot.c +++ b/hw/openrisc/boot.c @@ -44,7 +44,8 @@ hwaddr openrisc_load_kernel(ram_addr_t ram_size, if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR, - ram_size - KERNEL_LOAD_ADDR); + ram_size - KERNEL_LOAD_ADDR, + NULL); high_addr =3D KERNEL_LOAD_ADDR + kernel_size; } =20 @@ -74,7 +75,7 @@ hwaddr openrisc_load_initrd(void *fdt, const char *filena= me, =20 size =3D load_ramdisk(filename, start, mem_size - start); if (size < 0) { - size =3D load_image_targphys(filename, start, mem_size - start); + size =3D load_image_targphys(filename, start, mem_size - start, NU= LL); if (size < 0) { error_report("could not load ramdisk '%s'", filename); exit(1); diff --git a/hw/pci/pci.c b/hw/pci/pci.c index acc03fd470..738b0c41ae 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2557,7 +2557,7 @@ static void pci_add_option_rom(PCIDevice *pdev, bool = is_default_rom, path =3D g_strdup(pdev->romfile); } =20 - size =3D get_image_size(path); + size =3D get_image_size(path, NULL); if (size < 0) { error_setg(errp, "failed to find romfile \"%s\"", pdev->romfil= e); return; diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c index 47fb016b4a..192474e0ae 100644 --- a/hw/ppc/amigaone.c +++ b/hw/ppc/amigaone.c @@ -324,7 +324,7 @@ static void amigaone_init(MachineState *machine) error_report("Could not find firmware '%s'", machine->firmware= ); exit(1); } - sz =3D load_image_targphys(filename, PROM_ADDR, PROM_SIZE); + sz =3D load_image_targphys(filename, PROM_ADDR, PROM_SIZE, NULL); if (sz <=3D 0 || sz > PROM_SIZE) { error_report("Could not load firmware '%s'", filename); exit(1); @@ -413,7 +413,7 @@ static void amigaone_init(MachineState *machine) loadaddr =3D ROUND_UP(loadaddr + 4 * MiB, 4 * KiB); loadaddr =3D MAX(loadaddr, INITRD_MIN_ADDR); sz =3D load_image_targphys(machine->initrd_filename, loadaddr, - bi->bd_info - loadaddr); + bi->bd_info - loadaddr, NULL); if (sz <=3D 0) { error_report("Could not load initrd '%s'", machine->initrd_filename); diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 3d69428f31..418e1bb2fb 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1227,7 +1227,7 @@ void ppce500_init(MachineState *machine) kernel_base =3D cur_base; kernel_size =3D load_image_targphys(machine->kernel_filename, cur_base, - machine->ram_size - cur_base); + machine->ram_size - cur_base, NU= LL); if (kernel_size < 0) { error_report("could not load kernel '%s'", machine->kernel_filename); @@ -1241,7 +1241,8 @@ void ppce500_init(MachineState *machine) if (machine->initrd_filename) { initrd_base =3D (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK; initrd_size =3D load_image_targphys(machine->initrd_filename, init= rd_base, - machine->ram_size - initrd_base); + machine->ram_size - initrd_base, + NULL); =20 if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 0b6e096116..004efc6b97 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -188,7 +188,8 @@ static void ppc_core99_init(MachineState *machine) =20 if (bios_size <=3D 0) { /* or load binary ROM image */ - bios_size =3D load_image_targphys(filename, PROM_BASE, PROM_SI= ZE); + bios_size =3D load_image_targphys(filename, PROM_BASE, PROM_SI= ZE, + NULL); } g_free(filename); } @@ -210,7 +211,8 @@ static void ppc_core99_init(MachineState *machine) if (kernel_size < 0) { kernel_size =3D load_image_targphys(machine->kernel_filename, kernel_base, - machine->ram_size - kernel_b= ase); + machine->ram_size - kernel_b= ase, + NULL); } if (kernel_size < 0) { error_report("could not load kernel '%s'", @@ -222,7 +224,8 @@ static void ppc_core99_init(MachineState *machine) initrd_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size + = KERNEL_GAP); initrd_size =3D load_image_targphys(machine->initrd_filename, initrd_base, - machine->ram_size - initrd_b= ase); + machine->ram_size - initrd_b= ase, + NULL); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", machine->initrd_filename); diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 40ae936ad8..c7e44d49b0 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -143,7 +143,8 @@ static void ppc_heathrow_init(MachineState *machine) =20 if (bios_size <=3D 0) { /* or if could not load ELF try loading a binary ROM image */ - bios_size =3D load_image_targphys(filename, PROM_BASE, PROM_SI= ZE); + bios_size =3D load_image_targphys(filename, PROM_BASE, PROM_SI= ZE, + NULL); bios_addr =3D PROM_BASE; } g_free(filename); @@ -166,7 +167,8 @@ static void ppc_heathrow_init(MachineState *machine) if (kernel_size < 0) { kernel_size =3D load_image_targphys(machine->kernel_filename, kernel_base, - machine->ram_size - kernel_b= ase); + machine->ram_size - kernel_b= ase, + NULL); } if (kernel_size < 0) { error_report("could not load kernel '%s'", @@ -179,7 +181,8 @@ static void ppc_heathrow_init(MachineState *machine) KERNEL_GAP); initrd_size =3D load_image_targphys(machine->initrd_filename, initrd_base, - machine->ram_size - initrd_b= ase); + machine->ram_size - initrd_b= ase, + NULL); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", machine->initrd_filename); diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 93696ed381..a9e706644c 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -197,7 +197,8 @@ static void pegasos_init(MachineState *machine) sz =3D load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0); if (sz <=3D 0) { - sz =3D load_image_targphys(filename, pm->vof ? 0 : prom_addr, PROM= _SIZE); + sz =3D load_image_targphys(filename, pm->vof ? 0 : prom_addr, PROM= _SIZE, + NULL); } if (sz <=3D 0 || sz > PROM_SIZE) { error_report("Could not load firmware '%s'", filename); @@ -301,7 +302,7 @@ static void pegasos_init(MachineState *machine) pm->initrd_addr =3D ROUND_UP(pm->initrd_addr, 4); pm->initrd_addr =3D MAX(pm->initrd_addr, INITRD_MIN_ADDR); sz =3D load_image_targphys(machine->initrd_filename, pm->initrd_ad= dr, - machine->ram_size - pm->initrd_addr); + machine->ram_size - pm->initrd_addr, NULL= ); if (sz <=3D 0) { error_report("Could not load initrd '%s'", machine->initrd_filename); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index f0469cdb8b..1c0dadda87 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1068,7 +1068,8 @@ static void pnv_init(MachineState *machine) exit(1); } =20 - fw_size =3D load_image_targphys(fw_filename, pnv->fw_load_addr, FW_MAX= _SIZE); + fw_size =3D load_image_targphys(fw_filename, pnv->fw_load_addr, FW_MAX= _SIZE, + NULL); if (fw_size < 0) { error_report("Could not load OPAL firmware '%s'", fw_filename); exit(1); @@ -1080,7 +1081,8 @@ static void pnv_init(MachineState *machine) long kernel_size; =20 kernel_size =3D load_image_targphys(machine->kernel_filename, - KERNEL_LOAD_ADDR, KERNEL_MAX_SIZ= E); + KERNEL_LOAD_ADDR, KERNEL_MAX_SIZ= E, + NULL); if (kernel_size < 0) { error_report("Could not load kernel '%s'", machine->kernel_filename); @@ -1092,7 +1094,8 @@ static void pnv_init(MachineState *machine) if (machine->initrd_filename) { pnv->initrd_base =3D INITRD_LOAD_ADDR; pnv->initrd_size =3D load_image_targphys(machine->initrd_filename, - pnv->initrd_base, INITRD_MAX_SIZE); + pnv->initrd_base, + INITRD_MAX_SIZE, NULL); if (pnv->initrd_size < 0) { error_report("Could not load initial ram disk '%s'", machine->initrd_filename); diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 6fff0d8afb..7c66912c10 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -242,7 +242,8 @@ static void bamboo_init(MachineState *machine) /* Load initrd. */ if (initrd_filename) { initrd_size =3D load_image_targphys(initrd_filename, RAMDISK_ADDR, - machine->ram_size - RAMDISK_ADDR= ); + machine->ram_size - RAMDISK_ADDR, + NULL); =20 if (initrd_size < 0) { error_report("could not load ram disk '%s' at %x", diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index c730cb3429..0759e95cb6 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -280,7 +280,7 @@ static void ibm_40p_init(MachineState *machine) bios_size =3D load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, N= ULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0); if (bios_size < 0) { - bios_size =3D load_image_targphys(filename, BIOS_ADDR, BIOS_SIZE); + bios_size =3D load_image_targphys(filename, BIOS_ADDR, BIOS_SIZE, = NULL); } if (bios_size < 0 || bios_size > BIOS_SIZE) { error_report("Could not load bios image '%s'", filename); @@ -379,7 +379,8 @@ static void ibm_40p_init(MachineState *machine) kernel_base =3D KERNEL_LOAD_ADDR; kernel_size =3D load_image_targphys(machine->kernel_filename, kernel_base, - machine->ram_size - kernel_base); + machine->ram_size - kernel_base, + NULL); if (kernel_size < 0) { error_report("could not load kernel '%s'", machine->kernel_filename); @@ -392,7 +393,8 @@ static void ibm_40p_init(MachineState *machine) initrd_base =3D INITRD_LOAD_ADDR; initrd_size =3D load_image_targphys(machine->initrd_filename, initrd_base, - machine->ram_size - initrd_b= ase); + machine->ram_size - initrd_b= ase, + NULL); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", machine->initrd_filename); diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index ee31bd8f34..68d3eacbff 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -494,7 +494,8 @@ static void sam460ex_init(MachineState *machine) if (machine->initrd_filename) { initrd_size =3D load_image_targphys(machine->initrd_filename, RAMDISK_ADDR, - machine->ram_size - RAMDISK_ADDR= ); + machine->ram_size - RAMDISK_ADDR, + NULL); if (initrd_size < 0) { error_report("could not load ram disk '%s' at %x", machine->initrd_filename, RAMDISK_ADDR); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6764730beb..cdf2fdeadc 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2854,7 +2854,7 @@ static void spapr_machine_init(MachineState *machine) error_report("Could not find LPAR firmware '%s'", bios_name); exit(1); } - fw_size =3D load_image_targphys(filename, 0, FW_MAX_SIZE); + fw_size =3D load_image_targphys(filename, 0, FW_MAX_SIZE, NULL); if (fw_size <=3D 0) { error_report("Could not load LPAR firmware '%s'", filename); exit(1); @@ -3115,9 +3115,9 @@ static void spapr_machine_init(MachineState *machine) spapr->initrd_base =3D (spapr->kernel_addr + spapr->kernel_size + 0x1ffff) & ~0xffff; spapr->initrd_size =3D load_image_targphys(initrd_filename, - spapr->initrd_base, - load_limit - - spapr->initrd_base); + spapr->initrd_base, + load_limit - spapr->initrd= _base, + NULL); if (spapr->initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index c9969ae48a..00d9ab7509 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -253,7 +253,7 @@ static void virtex_init(MachineState *machine) /* If we failed loading ELF's try a raw image. */ kernel_size =3D load_image_targphys(kernel_filename, boot_offset, - machine->ram_size); + machine->ram_size, NULL); boot_info.bootstrap_pc =3D boot_offset; high =3D boot_info.bootstrap_pc + kernel_size + 8192; } @@ -264,7 +264,8 @@ static void virtex_init(MachineState *machine) if (machine->initrd_filename) { initrd_base =3D high =3D ROUND_UP(high, 4); initrd_size =3D load_image_targphys(machine->initrd_filename, - high, machine->ram_size - hi= gh); + high, machine->ram_size - hi= gh, + NULL); =20 if (initrd_size < 0) { error_report("couldn't load ram disk '%s'", diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 828a867be3..f38078c8c2 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -172,7 +172,8 @@ target_ulong riscv_load_firmware(const char *firmware_f= ilename, =20 firmware_size =3D load_image_targphys_as(firmware_filename, *firmware_load_addr, - current_machine->ram_size, NULL= ); + current_machine->ram_size, NULL, + NULL); =20 if (firmware_size > 0) { return *firmware_load_addr + firmware_size; @@ -207,7 +208,7 @@ static void riscv_load_initrd(MachineState *machine, RI= SCVBootInfo *info) =20 size =3D load_ramdisk(filename, start, mem_size - start); if (size =3D=3D -1) { - size =3D load_image_targphys(filename, start, mem_size - start); + size =3D load_image_targphys(filename, start, mem_size - start, NU= LL); if (size =3D=3D -1) { error_report("could not load ramdisk '%s'", filename); exit(1); @@ -262,7 +263,7 @@ void riscv_load_kernel(MachineState *machine, } =20 kernel_size =3D load_image_targphys_as(kernel_filename, kernel_start_a= ddr, - current_machine->ram_size, NULL); + current_machine->ram_size, NULL, = NULL); if (kernel_size > 0) { info->kernel_size =3D kernel_size; info->image_low_addr =3D kernel_start_addr; diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c index 5b9004e9e1..ed91c63178 100644 --- a/hw/rx/rx-gdbsim.c +++ b/hw/rx/rx-gdbsim.c @@ -63,7 +63,7 @@ static void rx_load_image(RXCPU *cpu, const char *filenam= e, long kernel_size; int i; =20 - kernel_size =3D load_image_targphys(filename, start, size); + kernel_size =3D load_image_targphys(filename, start, size, NULL); if (kernel_size < 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", filename); exit(1); diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 2f082396c7..3843d2a850 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -169,7 +169,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **= errp) } else { /* Try to load non-ELF file */ bios_size =3D load_image_targphys(bios_filename, ZIPL_IMAGE_ST= ART, - 4096); + 4096, NULL); ipl->bios_start_addr =3D ZIPL_IMAGE_START; } g_free(bios_filename); @@ -188,7 +188,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **= errp) &pentry, NULL, NULL, NULL, ELFDATA2MSB, EM_S390, 0, 0); if (kernel_size < 0) { - kernel_size =3D load_image_targphys(ipl->kernel, 0, ms->ram_si= ze); + kernel_size =3D load_image_targphys(ipl->kernel, 0, ms->ram_si= ze, + NULL); if (kernel_size < 0) { error_setg(errp, "could not load kernel '%s'", ipl->kernel= ); return; @@ -247,7 +248,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **= errp) initrd_offset +=3D 0x100000; } initrd_size =3D load_image_targphys(ipl->initrd, initrd_offset, - ms->ram_size - initrd_offset= ); + ms->ram_size - initrd_offset, + NULL); if (initrd_size =3D=3D -1) { error_setg(errp, "could not load initrd '%s'", ipl->initrd= ); return; diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index d68c94e82e..010be6d539 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -329,8 +329,9 @@ static void r2d_init(MachineState *machine) int kernel_size; =20 kernel_size =3D load_image_targphys(kernel_filename, - SDRAM_BASE + LINUX_LOAD_OFFSET, - INITRD_LOAD_OFFSET - LINUX_LOAD_= OFFSET); + SDRAM_BASE + LINUX_LOAD_OFFSET, + INITRD_LOAD_OFFSET - LINUX_LOAD_OF= FSET, + NULL); if (kernel_size < 0) { error_report("qemu: could not load kernel '%s'", kernel_filena= me); exit(1); @@ -350,7 +351,8 @@ static void r2d_init(MachineState *machine) =20 initrd_size =3D load_image_targphys(initrd_filename, SDRAM_BASE + INITRD_LOAD_OFFSET, - SDRAM_SIZE - INITRD_LOAD_OFFSET); + SDRAM_SIZE - INITRD_LOAD_OFFSET, + NULL); =20 if (initrd_size < 0) { error_report("qemu: could not load initrd '%s'", initrd_filena= me); diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 13e21a9c43..7558b2ad83 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -1340,7 +1340,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) return; } =20 - size =3D get_image_size(val); + size =3D get_image_size(val, NULL); if (size =3D=3D -1 || size < sizeof(struct smbios_structure_header= )) { error_setg(errp, "Cannot read SMBIOS file %s", val); return; diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 09d2cec488..631c6113b5 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -349,7 +349,7 @@ static void leon3_generic_hw_init(MachineState *machine) filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); =20 if (filename) { - bios_size =3D get_image_size(filename); + bios_size =3D get_image_size(filename, NULL); } else { bios_size =3D -1; } @@ -360,7 +360,7 @@ static void leon3_generic_hw_init(MachineState *machine) } =20 if (bios_size > 0) { - ret =3D load_image_targphys(filename, LEON3_PROM_OFFSET, bios_size= ); + ret =3D load_image_targphys(filename, LEON3_PROM_OFFSET, bios_size= , NULL); if (ret < 0 || ret > prom_size) { error_report("could not load prom '%s'", filename); exit(1); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 8ac7e625ef..53d7ae08ae 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -245,7 +245,8 @@ static unsigned long sun4m_load_kernel(const char *kern= el_filename, if (kernel_size < 0) kernel_size =3D load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR, - RAM_size - KERNEL_LOAD_ADDR); + RAM_size - KERNEL_LOAD_ADDR, + NULL); if (kernel_size < 0) { error_report("could not load kernel '%s'", kernel_filename); exit(1); @@ -256,7 +257,8 @@ static unsigned long sun4m_load_kernel(const char *kern= el_filename, if (initrd_filename) { *initrd_size =3D load_image_targphys(initrd_filename, INITRD_LOAD_ADDR, - RAM_size - INITRD_LOAD_ADDR= ); + RAM_size - INITRD_LOAD_ADDR, + NULL); if ((int)*initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -700,7 +702,7 @@ static void prom_init(hwaddr addr, const char *bios_nam= e) translate_prom_address, &addr, NULL, NULL, NULL, NULL, ELFDATA2MSB, EM_SPARC, 0, 0); if (ret < 0 || ret > PROM_SIZE_MAX) { - ret =3D load_image_targphys(filename, addr, PROM_SIZE_MAX); + ret =3D load_image_targphys(filename, addr, PROM_SIZE_MAX, NUL= L); } g_free(filename); } else { diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index e9f9b0a4cb..82c3e7c855 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -182,7 +182,8 @@ static uint64_t sun4u_load_kernel(const char *kernel_fi= lename, if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR, - RAM_size - KERNEL_LOAD_ADDR); + RAM_size - KERNEL_LOAD_ADDR, + NULL); } if (kernel_size < 0) { error_report("could not load kernel '%s'", kernel_filename); @@ -195,7 +196,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_fi= lename, =20 *initrd_size =3D load_image_targphys(initrd_filename, *initrd_addr, - RAM_size - *initrd_addr); + RAM_size - *initrd_addr, NU= LL); if ((int)*initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -437,7 +438,7 @@ static void prom_init(hwaddr addr, const char *bios_nam= e) ret =3D load_elf(filename, NULL, translate_prom_address, &addr, NULL, NULL, NULL, NULL, ELFDATA2MSB, EM_SPARCV9, 0,= 0); if (ret < 0 || ret > PROM_SIZE_MAX) { - ret =3D load_image_targphys(filename, addr, PROM_SIZE_MAX); + ret =3D load_image_targphys(filename, addr, PROM_SIZE_MAX, NUL= L); } g_free(filename); } else { diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 55de1a7a07..db3b015549 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -381,7 +381,8 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, M= achineState *machine) if (initrd_size < 0) { initrd_size =3D load_image_targphys(initrd_filename, cur_lowmem, - lowmem_end - cur_lowmem); + lowmem_end - cur_lowmem, + NULL); } if (initrd_size < 0) { error_report("could not load initrd '%s'", initrd_filename= ); diff --git a/include/hw/loader.h b/include/hw/loader.h index c96b5e141c..d035e72748 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -1,6 +1,7 @@ #ifndef LOADER_H #define LOADER_H #include "hw/nvram/fw_cfg.h" +#include "qemu/typedefs.h" =20 /* loader.c */ /** @@ -10,7 +11,7 @@ * Returns the size of the image file on success, -1 otherwise. * On error, errno is also set as appropriate. */ -int64_t get_image_size(const char *filename); +int64_t get_image_size(const char *filename, Error **errp); /** * load_image_size: load an image file into specified buffer * @filename: Path to the image file @@ -41,7 +42,8 @@ ssize_t load_image_size(const char *filename, void *addr,= size_t size); * Returns the size of the loaded image on success, -1 otherwise. */ ssize_t load_image_targphys_as(const char *filename, - hwaddr addr, uint64_t max_sz, AddressSpace = *as); + hwaddr addr, uint64_t max_sz, AddressSpace = *as, + Error **errp); =20 /**load_targphys_hex_as: * @filename: Path to the .hex file @@ -61,7 +63,7 @@ ssize_t load_targphys_hex_as(const char *filename, hwaddr= *entry, * an AddressSpace. */ ssize_t load_image_targphys(const char *filename, hwaddr, - uint64_t max_sz); + uint64_t max_sz, Error **errp); =20 /** * load_image_mr: load an image into a memory region diff --git a/system/device_tree.c b/system/device_tree.c index aa3fe9516f..7850b90fa7 100644 --- a/system/device_tree.c +++ b/system/device_tree.c @@ -83,7 +83,7 @@ void *load_device_tree(const char *filename_path, int *si= zep) void *fdt =3D NULL; =20 *sizep =3D 0; - dt_size =3D get_image_size(filename_path); + dt_size =3D get_image_size(filename_path, NULL); if (dt_size < 0) { error_report("Unable to get size of device tree file '%s'", filename_path); --=20 2.51.0 From nobody Mon Oct 27 11:10:16 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=1761311286; cv=none; d=zohomail.com; s=zohoarc; b=YQ5D4J3XrGNDBeyBV3VT5sKPdme7606D7eGI9tmSolPjGSTDPeM6g4nZYD/P7uDr0hlXer9xMdJevRV58GNuWjFdgMumEAKtHv8pJTxB84OqW8NVFKwFkh8pinIwHC7m4/a/ma3DUM9+NdZVNmRu2lABedA24Ht5DBtUFWE62fU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761311286; 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=GjZUm36zIlxuvlX5yniRl5OGta2DnXEjj3KtIROiwCc=; b=n1l8haFgkiebxQvIKvxw3c2CpfvCFHeYzyoSqRvwxn74mLCBRi9cB3YfJo8UGiVGzesJbq1C+ADjRI60S+pVDrFYwXlad+82WKEiEPy3yo8ds3Sce12Sh/dsB4Iu38pSXtC7fq7Du4QjwneZYyf7UeEXt8v9X4M44u+NPM9YcXE= 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 1761311286600581.6689404208739; Fri, 24 Oct 2025 06:08:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCHVY-0007X5-WD; Fri, 24 Oct 2025 09:07:05 -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 1vCHVX-0007Wa-LY; Fri, 24 Oct 2025 09:07:03 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vCHVU-0002w5-TF; Fri, 24 Oct 2025 09:07:03 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59O4hwn7008513; Fri, 24 Oct 2025 13:06:57 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v32hwrbt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:57 +0000 (GMT) Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 59OCxBiT010114; Fri, 24 Oct 2025 13:06:56 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v32hwrbm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:56 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59OA0uuL002320; Fri, 24 Oct 2025 13:06:55 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 49vqejtyum-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:06:55 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59OD6p9525624942 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Oct 2025 13:06:52 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E577220043; Fri, 24 Oct 2025 13:06:51 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9096D20040; Fri, 24 Oct 2025 13:06:49 +0000 (GMT) Received: from vishalc-ibm.ibm.com (unknown [9.39.24.189]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 24 Oct 2025 13:06:48 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=GjZUm3 6zIlxuvlX5yniRl5OGta2DnXEjj3KtIROiwCc=; b=jr5SAuDz5hcjIG2xmzWZ0K CKnuYH+IIF5VSsOjn0Eo1MEbZJ4zjr1+mDZ/fMoPImNOpbJdu3ZrC/ehvdgAqMec IuI13XboA4R/6zBCN0tEhtETJogHn84yK6g1WAUiJc/4sVStyVPqlusZcMRqFWWr P2unnpQGP/ZXjsAfm7N8919vcpcbOGxVW7SUvGcuXaTSMxnWKXY8WOWYXE0zQukw 8D/NTtmceC08Ov0UfHv1Kq7L6Dq+rfhOLN3zQITLz7JiTw9fnyGJRtLMHs4OrbfA QGNXdbuDDKHPUrKBZhn1j0QATgCitvwFtOHa16hoaZGO1ATAtNTRB00FfA1ZCPxA == 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [Patch v10 3/6] core/loader: improve error handling in image loading functions Date: Fri, 24 Oct 2025 18:35:57 +0530 Message-ID: <20251024130556.1942835-8-vishalc@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251024130556.1942835-2-vishalc@linux.ibm.com> References: <20251024130556.1942835-2-vishalc@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAyMiBTYWx0ZWRfX6WazJiSI1hOx L7dT0SUK6KBvFlLKJuDRuTwVGo5j3qSx8FcNYPmlJoy4xmXWjBo7vtj08LzVRbvPP1PZmXDMtiu T8VpfgYH4c8aNhePYAl3hwzWiHItBWjE3+as94Xn4RwdYIMfUPVMUbroNIs3aLMCIfh7sPXczK3 088UpAEBJHJLgiS9//Yo5B817r4KcRuS4VKvqdSljjcuF8JyOkqWutuGwfquLgit6LevD8q9jII oL7BWGZeiKi90XO/4dd4FNWNjB2YHFY5d/OUjXfc6uEAnTivkC8y+cTHBwzV8hBO2c4e3yY4WRA fQqNaLhXG42r0TbnOiEaw1mhZHmMUt1Rx6N8EHn4dICWLIxOCit7FxGcifDKQda1PJmG9PMAPwA O9NQWVMzUEvghIN9HPUs064QRWwgXg== X-Authority-Analysis: v=2.4 cv=OrVCCi/t c=1 sm=1 tr=0 ts=68fb79f1 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=VnNF1IyMAAAA:8 a=ENWgr_On3KMaAUHH0hcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-GUID: EASlZlyhEEOer9tdjj_KMkaPhiyC9GaM X-Proofpoint-ORIG-GUID: -1bNlaDQgg7N9fQnkA_2IW625_owmj_b 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-24_02,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 priorityscore=1501 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=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.158.5; envelope-from=vishalc@linux.ibm.com; helo=mx0b-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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1761311288748158500 Add error checking for lseek() failure and provide better error messages when image loading fails, including filenames and addresses. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aditya Gupta Signed-off-by: Vishal Chourasia --- hw/core/loader.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 7aca4989ef..d7c11c18f1 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -79,6 +79,10 @@ int64_t get_image_size(const char *filename, Error **err= p) if (fd < 0) return -1; size =3D lseek(fd, 0, SEEK_END); + if (size < 0) { + error_setg_errno(errp, errno, "lseek failure: %s", filename); + return -1; + } close(fd); return size; } @@ -132,11 +136,20 @@ ssize_t load_image_targphys_as(const char *filename, ssize_t size; =20 size =3D get_image_size(filename, errp); - if (size < 0 || size > max_sz) { + if (size < 0) { + return -1; + } + + if (size > max_sz) { + error_setg(errp, "%s exceeds maximum image size (%s)", + filename, size_to_str(max_sz)); return -1; } + if (size > 0) { if (rom_add_file_fixed_as(filename, addr, -1, as) < 0) { + error_setg(errp, "could not load '%s' at %" HWADDR_PRIx, + filename, addr); return -1; } } --=20 2.51.0 From nobody Mon Oct 27 11:10:16 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=1761311288; cv=none; d=zohomail.com; s=zohoarc; b=R4jTr1fEeU+ZTJKszYAPmIYE9Ewn2VB/AWnUpIbRRFUvvzF3Jm1ScL5KQuX/xAn5+88btZ2BIZ3Rn3WHDGwg+r4PWTT+PSkxED+YZE4TOcFKF7cS5LoC6dpDnhhkf8nKwKgbw1hALGvadK4pmeavsWezhNluxBAaTXq3GjSIqqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761311288; 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=TshWinlQgx6YbPeZVFr/XGgoqLlWgLsvZO6Zj12+51U=; b=gNR6Vl2DZLvIRdus3uxbTBtAyYdyVuSvHYwxCZLEhSo0j9gZdWAvoIfglrZJwvzGX2rNEcnLq5lsuwPEMd65ckymEymuoCssy6F+OCAwhCjEd3f04sfCTgE2sTBve9B6TaNst9hArqwilGAo9ht1L44rZPWWcTdSCoEMZlntLXU= 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 1761311288634808.5437974867167; Fri, 24 Oct 2025 06:08:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCHVk-0007aJ-6Y; Fri, 24 Oct 2025 09:07:16 -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 1vCHVi-0007ZT-5U; Fri, 24 Oct 2025 09:07:14 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vCHVg-0002xK-5S; Fri, 24 Oct 2025 09:07:13 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59OB5mEV007202; Fri, 24 Oct 2025 13:07:08 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v30w5tgp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:08 +0000 (GMT) Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 59OD77qr020788; Fri, 24 Oct 2025 13:07:07 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 49v30w5tgk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:07 +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 59OD5P5W017067; Fri, 24 Oct 2025 13:07:07 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49vnkyba5s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:06 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59OD73to45023654 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Oct 2025 13:07:03 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 22A9620043; Fri, 24 Oct 2025 13:07:03 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2D5A820040; Fri, 24 Oct 2025 13:07:00 +0000 (GMT) Received: from vishalc-ibm.ibm.com (unknown [9.39.24.189]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 24 Oct 2025 13:06:59 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=TshWin lQgx6YbPeZVFr/XGgoqLlWgLsvZO6Zj12+51U=; b=I+8ugkZqSqnArivbPs1RSh yjcOGJxpFiTCk1JAQIxm/CojqK+NC4v9H6vpOVhzFc4GXfDm38rgyF0xOBEH5Qye 1ebg1vIq1T+sLCHKAZ0JnLxAnR6uovyvGp4/AgGIICcSrppBGrF34HNyDhSFItBF DkDDOengiOiRT0k7wsk3RGF4sOY1b/zNWuS6X6ySlUlglDEhmd9NjmFRTYnn+j/+ 0J00EcWjg/uQwa0nu8JxNqphSLwF5sGQEM35yHsfKrVFujePgMqUTkQLjWqLR0XX gPdd+hUNAy8TpNT9nc8Ms0e8SgjDC9nppE1VZi8ZKVALzEHREZVAp+XveEDGz32Q == 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [Patch v10 4/6] core/loader: add check for zero size in load_image_targphys_as Date: Fri, 24 Oct 2025 18:35:59 +0530 Message-ID: <20251024130556.1942835-10-vishalc@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251024130556.1942835-2-vishalc@linux.ibm.com> References: <20251024130556.1942835-2-vishalc@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: SVx4_a73j7T_8KvMbt2C5JFhTWm1AAtP X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAyMiBTYWx0ZWRfX4k+NJgafoHCo 7yHPj8i6PYtnYTCyK2Vlewx7eoDPvXdaSp4R6qWCK7pD2dVy+oME1SO94bNtwj5vBLKVAgO9Psx 9m2vcyVX9t3zev0kh0Tf1RVdZEz+A7uB4vLuZ4RI1hg+nGawORsCj6ttr5YXvwONe/BPyf4jy2k eRHzMKpqxn5F5brK8rbKuYYNQAS9+FaA5/T3SKrHe4PrtfvNPLp/xqOXhMQ2MOzEhF5tD8L+ATo KpGXNhP9oHV5nMW0eS0dbWl9kohEWJ+SlTKweqMeVGbTFdKaGRcVHBA7/5XHBAkUIoVtGM5V8zo Ebjc9IFRX/D1jDVrkt0MWmmZDzPjI3TvSGoL2GdMX59j2Sty3l93AvWqx+UKWB4dkvSd6T3kLlm eSWrn1BZi+ufCicIcTMFFjj9BGFH3g== X-Authority-Analysis: v=2.4 cv=MIJtWcZl c=1 sm=1 tr=0 ts=68fb79fc cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=VnNF1IyMAAAA:8 a=hY9edZusZr6h984EAK8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-ORIG-GUID: P7KN0czt_JTfZVzl6HNk2CDJTeV8MPi8 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-24_02,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 impostorscore=0 bulkscore=0 priorityscore=1501 suspectscore=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.158.5; envelope-from=vishalc@linux.ibm.com; helo=mx0b-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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1761311290760158500 Currently load_image_targphys_as() returns -1 on file open failure or when max size is exceeded. Add an explicit check for zero-sized files to catch this error early, since some callers check for size <=3D 0. Also, remove the redundant size > 0 check later in the function. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Vishal Chourasia --- hw/core/loader.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index d7c11c18f1..590c5b02aa 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -140,18 +140,21 @@ ssize_t load_image_targphys_as(const char *filename, return -1; } =20 + if (size =3D=3D 0) { + error_setg(errp, "empty file: %s", filename); + return -1; + } + if (size > max_sz) { error_setg(errp, "%s exceeds maximum image size (%s)", filename, size_to_str(max_sz)); return -1; } =20 - if (size > 0) { - if (rom_add_file_fixed_as(filename, addr, -1, as) < 0) { - error_setg(errp, "could not load '%s' at %" HWADDR_PRIx, - filename, addr); - return -1; - } + if (rom_add_file_fixed_as(filename, addr, -1, as) < 0) { + error_setg(errp, "could not load '%s' at %" HWADDR_PRIx, + filename, addr); + return -1; } return size; } --=20 2.51.0 From nobody Mon Oct 27 11:10:16 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=1761311307; cv=none; d=zohomail.com; s=zohoarc; b=W0Q4Xj9AS1ioZDB2rCAQCi0h8IV9yOipKBB/7qrwhlqSdbzAcJaH58Ao7eSk79gSLrmJ0w/hUiAb+BcvCzI1DlwBJT97XeoYOe50JvfDM9z8qgPaaa+DSzY54zr176vkJmOQv2cIJ8d3MqdhBLXtX89C+n2igJxvZ7ab+MjEcxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761311307; 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=yuKGlPt/QGpIxBQ01VSVo+CDBgyAQ4fkTyIKa9zzdqs=; b=OdBwY8HsqKSSBFEP6xLkQrKLcaHdpIqnUjYu2F+dKWptxd6hY+w8k79nlgWiKRENlOzPWbXALKbh/RGifCGGHA/RThlWqruwd7zEBS1pzqsFqYSTZTjV6cZe1/K6jYVLcpf7qKqYqyfXQaygTDtR1wNY9Bht6NSZE3E3+KxcVB0= 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 1761311307857415.0778483775159; Fri, 24 Oct 2025 06:08:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCHW1-0007mY-13; Fri, 24 Oct 2025 09:07:33 -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 1vCHVz-0007hB-1C; Fri, 24 Oct 2025 09:07:31 -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 1vCHVv-0002y7-Up; Fri, 24 Oct 2025 09:07:30 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59O630eI002474; Fri, 24 Oct 2025 13:07:23 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v3277dpa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:23 +0000 (GMT) Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 59OD2lrb013577; Fri, 24 Oct 2025 13:07:22 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v3277dp4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:22 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59OA9kP3024940; Fri, 24 Oct 2025 13:07:21 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49vpqkb3p1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:21 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59OD7HCC56230236 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Oct 2025 13:07:17 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8D94820043; Fri, 24 Oct 2025 13:07:17 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A55BA20040; Fri, 24 Oct 2025 13:07:14 +0000 (GMT) Received: from vishalc-ibm.ibm.com (unknown [9.39.24.189]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 24 Oct 2025 13:07:14 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=yuKGlP t/QGpIxBQ01VSVo+CDBgyAQ4fkTyIKa9zzdqs=; b=ZP5fexnQ3GSxYqozdD+Wvq o2WajP05Gj2K/6VckjdNhein30+fEc6cn50E0iJNU16+g/OlkgSJs5InaleKI1a2 Fvto52SjoZIihSqrin4HaNoNUhZCthtg/NxkthZSlE50pqTGtH+/gwsI3vY9qDBG 7gG6nF6tRAzJB28y4BfDGqwElHwaXfh84vjuqsREd/5s/3abp7xSOzXcPtPjsLbI eixo8GeRPvV86inscX3iZB/6TD17f8WUziBkHJW6iiKnenMoCVxR39cERkBn/KlR 8sJHsFqTKsOzdewc2HJv2jZMgU/DfDK9iQlB7KrmINJo2I5H3lpfb/NNZsYyG5Nw == 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [Patch v10 5/6] core: Pass errp to load_image_targphys_as() Date: Fri, 24 Oct 2025 18:36:01 +0530 Message-ID: <20251024130556.1942835-12-vishalc@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251024130556.1942835-2-vishalc@linux.ibm.com> References: <20251024130556.1942835-2-vishalc@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=EJELElZC c=1 sm=1 tr=0 ts=68fb7a0b cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=VnNF1IyMAAAA:8 a=5QmAwwa3-A6azPfluFIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAyMiBTYWx0ZWRfX7dBOzbg2fLgj LoLX+AsyflbvBDN32s4B+r+CcnqzlvUX0q4B1Q/SqaeTNodUy9TulrDQHruWBjK/+QSXjSHQxia ppRhAW71LgILR57F0x7htxwjB2+4UgopOYciQOWGMvK+eeKWTZYgs8uc2KF+jUVGRikJbak/ooJ dYFYnysNbWnHjtWCES5Eqo9k3OwNfapOBLVn17wYkpmxXYNVphBpYDZdV/Udt8S9VYyfz9GEQxq 1ZVAbRHJYa6AtsypRGntC+cmatuUXkR5RihL5uE75q1bapifhXZDPbhCQp6xBV6RHwPrAm7P6Xp IFaAzmLnGIbbiOjIaOI7wrLflQmElCh0v65dEgg7CWOeiVtxDJXicg750IbZrCdaN7HELgYH1eN PiSeaDbI4wMFEBV73Mh/HOx3kZL4YA== X-Proofpoint-GUID: MGyWxHI9tz3Osi3zq2Epud869Fdru40l X-Proofpoint-ORIG-GUID: iNnQE7SxJEOrNAZx3F2MNRJaDvIeFkU6 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-24_02,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 spamscore=0 malwarescore=0 phishscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1761311310812158500 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Vishal Chourasia --- hw/core/generic-loader.c | 4 ++-- hw/core/guest-loader.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 6689847c33..433efb7387 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -149,13 +149,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); + 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..618455e556 100644 --- a/hw/core/guest-loader.c +++ b/hw/core/guest-loader.c @@ -101,9 +101,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); + NULL, errp); if (size < 0) { - error_setg(errp, "Cannot load specified image %s", file); + error_prepend(errp, "Cannot load specified image %s: ", file); return; } =20 --=20 2.51.0 From nobody Mon Oct 27 11:10:16 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=1761311303; cv=none; d=zohomail.com; s=zohoarc; b=KurY8ifojC8t1EbVuqhCKrYG4i5dxTax9h9nzexe5SLIa4CVji8psnKy/23MEdOFJXdOPPgqdshy8k48DX/K/jXG7VaHmS9nXsSzIT+mWmK6d0PGlBc3805G2CmLjSs2ZIDYChRLGCeFCTLkcvyQsQWj4SJu+prEcN9EArrPcLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761311303; 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=XJlGOUkZlfxVEWSh/wQCtLrO28qDQv+ZbG+7KHjfNFU=; b=Ks0vZLBERnv781IWB7O1tdQwNRJ/lkDp37dIVJl7iVDoPaSr3Fi6NWxOdo3/CV3kjP4YnhZmKmyI9/ArE8Ov+Xnzx8377ozMV8mqElmAWYIC3KKvdeP31Gk51grmFXjtOD18rzVnkTcQf1rv1id9/zZkexKZIAJuqyz6F4edxyA= 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 1761311303618869.010619077598; Fri, 24 Oct 2025 06:08:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCHWE-0000Sv-RL; Fri, 24 Oct 2025 09:07:46 -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 1vCHWC-0000L6-KU; Fri, 24 Oct 2025 09:07:44 -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 1vCHW8-0002ze-Mb; Fri, 24 Oct 2025 09:07:44 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59OCXClS020537; Fri, 24 Oct 2025 13:07:34 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v31sfcv4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:34 +0000 (GMT) Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 59OD7YOb012102; Fri, 24 Oct 2025 13:07:34 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v31sfcv1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:33 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59O9u6mf002926; Fri, 24 Oct 2025 13:07:33 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 49vqejtywe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Oct 2025 13:07:32 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59OD7TfO61341952 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Oct 2025 13:07:29 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2E9732004D; Fri, 24 Oct 2025 13:07:29 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2B3B320040; Fri, 24 Oct 2025 13:07:26 +0000 (GMT) Received: from vishalc-ibm.ibm.com (unknown [9.39.24.189]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 24 Oct 2025 13:07:25 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=XJlGOU kZlfxVEWSh/wQCtLrO28qDQv+ZbG+7KHjfNFU=; b=PUPa/JNYxOKluOaqXOaVNA T/OKDgAN55lfWOJx1GmTx3JqkbV2lhzzIY9qDx6Zs8MLX2NM6RnmwSuZNtgJjN/G VZN7DnPdnf2X8OWTtfhAHsnsfQzuuu+UWHiJW7fhjCQyd+gCZQTL9KlGwO20tJrG ABuv+5Icx/PiL13+GUyQs/mfNB6oUDSgLQnxOokfishjKHIXpnukX/GQ20QoXkO+ LIxJYaw0ym8jr6Fd06lV0ClRh0XJoUaHMV+TO46jpO4WL3jc4dEW6Ad+r7RCXEus bUwi3qGPKzuYj6WQn7vCav5BlaSXPvfoO5oqgIv/3ZC+c5vZLuqVPPpHQgmyAWSw == 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, hpoussin@reactos.org Cc: Vishal Chourasia , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [Patch v10 6/6] ppc: Pass error_fatal to load_image_targphys() Date: Fri, 24 Oct 2025 18:36:03 +0530 Message-ID: <20251024130556.1942835-14-vishalc@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251024130556.1942835-2-vishalc@linux.ibm.com> References: <20251024130556.1942835-2-vishalc@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 3ArjAcOEa3UCbk2YRByrFBl_RcoKn59A X-Proofpoint-GUID: Xn1EI7W_8Q16HtopEVmTX3r2BPnV5dZu X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAyMiBTYWx0ZWRfX8PolSy0Z1ONc ZYCzc8Z2ZPlOry9mse7ptNL1AnY2grD2TCFPgrTnGOfLOba7VLf1Xb+AFWXmavX4dATZe2rtHqd uqOM/sBuVoi4NCQOZgXv9oESX5HV97fBco60mRfvXZZeqWNGNNeyrHAdiWVPf/xXootLbkH/is/ iqhPWBbrSEROiAovo8/ARZKjochffcu3RwktXrDYYlJrkzDIGmuM7qDJ6Wgmfj4DtjHS43jcvic azPgOIFjxR3PC6eKFi1r/QX3Bss/vLd/Uf55167sJNhBrjCMFaIN98hCfOfHsqWn/1CAO71yF60 HKShAt9UqsZT3vAGluqfhbHaBGMNPMx9yHseGeKPGegOIRTsvA8u6gjICRhoJVGSiXYg53pWndh qlxIcMLjWf5TPijg0ZtoGt7mVwrPRw== X-Authority-Analysis: v=2.4 cv=IJYPywvG c=1 sm=1 tr=0 ts=68fb7a16 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=KKAkSRfTAAAA:8 a=-Rt1QlvtLuBJMzJCn24A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 a=cPQSjfK2_nFv0Q5t_7PE:22 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-24_02,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 spamscore=0 bulkscore=0 adultscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1761311309133158500 Pass error_fatal to load_image_targphys() calls in ppc machine initializati= on to capture detailed error information when loading firmware, kernel, and initrd images. Passing error_fatal automatically reports detailed error messages and exits immediately on failure. Eliminating redundant exit(1) calls, as error_fatal handles termination The behavior remains functionally identical, but error messages now come directly from the loader function with more context about the failure cause. Reviewed-by: Aditya Gupta Reviewed-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Vishal Chourasia --- hw/ppc/amigaone.c | 13 ++----------- hw/ppc/e500.c | 19 +++---------------- hw/ppc/mac_newworld.c | 16 +++------------- hw/ppc/mac_oldworld.c | 16 +++------------- hw/ppc/pegasos2.c | 9 ++------- hw/ppc/pnv.c | 28 +++++----------------------- hw/ppc/ppc440_bamboo.c | 8 +------- hw/ppc/prep.c | 17 ++++------------- hw/ppc/sam460ex.c | 7 +------ hw/ppc/spapr.c | 13 ++----------- hw/ppc/virtex_ml507.c | 10 ++-------- 11 files changed, 28 insertions(+), 128 deletions(-) diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c index 192474e0ae..74a1fa3b63 100644 --- a/hw/ppc/amigaone.c +++ b/hw/ppc/amigaone.c @@ -324,11 +324,7 @@ static void amigaone_init(MachineState *machine) error_report("Could not find firmware '%s'", machine->firmware= ); exit(1); } - sz =3D load_image_targphys(filename, PROM_ADDR, PROM_SIZE, NULL); - if (sz <=3D 0 || sz > PROM_SIZE) { - error_report("Could not load firmware '%s'", filename); - exit(1); - } + sz =3D load_image_targphys(filename, PROM_ADDR, PROM_SIZE, &error_= fatal); } =20 /* Articia S */ @@ -413,12 +409,7 @@ static void amigaone_init(MachineState *machine) loadaddr =3D ROUND_UP(loadaddr + 4 * MiB, 4 * KiB); loadaddr =3D MAX(loadaddr, INITRD_MIN_ADDR); sz =3D load_image_targphys(machine->initrd_filename, loadaddr, - bi->bd_info - loadaddr, NULL); - if (sz <=3D 0) { - error_report("Could not load initrd '%s'", - machine->initrd_filename); - exit(1); - } + bi->bd_info - loadaddr, &error_fatal); bi->initrd_start =3D loadaddr; bi->initrd_end =3D loadaddr + sz; } diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 418e1bb2fb..8842f7f6b8 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1226,14 +1226,8 @@ void ppce500_init(MachineState *machine) if (machine->kernel_filename && !kernel_as_payload) { kernel_base =3D cur_base; kernel_size =3D load_image_targphys(machine->kernel_filename, - cur_base, - machine->ram_size - cur_base, NU= LL); - if (kernel_size < 0) { - error_report("could not load kernel '%s'", - machine->kernel_filename); - exit(1); - } - + cur_base, machine->ram_size - cur_ba= se, + &error_fatal); cur_base +=3D kernel_size; } =20 @@ -1242,14 +1236,7 @@ void ppce500_init(MachineState *machine) initrd_base =3D (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK; initrd_size =3D load_image_targphys(machine->initrd_filename, init= rd_base, machine->ram_size - initrd_base, - NULL); - - if (initrd_size < 0) { - error_report("could not load initial ram disk '%s'", - machine->initrd_filename); - exit(1); - } - + &error_fatal); cur_base =3D initrd_base + initrd_size; } =20 diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 004efc6b97..951de4bae4 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -189,7 +189,7 @@ static void ppc_core99_init(MachineState *machine) if (bios_size <=3D 0) { /* or load binary ROM image */ bios_size =3D load_image_targphys(filename, PROM_BASE, PROM_SI= ZE, - NULL); + &error_fatal); } g_free(filename); } @@ -212,12 +212,7 @@ static void ppc_core99_init(MachineState *machine) kernel_size =3D load_image_targphys(machine->kernel_filename, kernel_base, machine->ram_size - kernel_b= ase, - NULL); - } - if (kernel_size < 0) { - error_report("could not load kernel '%s'", - machine->kernel_filename); - exit(1); + &error_fatal); } /* load initrd */ if (machine->initrd_filename) { @@ -225,12 +220,7 @@ static void ppc_core99_init(MachineState *machine) initrd_size =3D load_image_targphys(machine->initrd_filename, initrd_base, machine->ram_size - initrd_b= ase, - NULL); - if (initrd_size < 0) { - error_report("could not load initial ram disk '%s'", - machine->initrd_filename); - exit(1); - } + &error_fatal); cmdline_base =3D TARGET_PAGE_ALIGN(initrd_base + initrd_size); } else { cmdline_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size += KERNEL_GAP); diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index c7e44d49b0..cd2bb46442 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -144,7 +144,7 @@ static void ppc_heathrow_init(MachineState *machine) if (bios_size <=3D 0) { /* or if could not load ELF try loading a binary ROM image */ bios_size =3D load_image_targphys(filename, PROM_BASE, PROM_SI= ZE, - NULL); + &error_fatal); bios_addr =3D PROM_BASE; } g_free(filename); @@ -168,12 +168,7 @@ static void ppc_heathrow_init(MachineState *machine) kernel_size =3D load_image_targphys(machine->kernel_filename, kernel_base, machine->ram_size - kernel_b= ase, - NULL); - } - if (kernel_size < 0) { - error_report("could not load kernel '%s'", - machine->kernel_filename); - exit(1); + &error_fatal); } /* load initrd */ if (machine->initrd_filename) { @@ -182,12 +177,7 @@ static void ppc_heathrow_init(MachineState *machine) initrd_size =3D load_image_targphys(machine->initrd_filename, initrd_base, machine->ram_size - initrd_b= ase, - NULL); - if (initrd_size < 0) { - error_report("could not load initial ram disk '%s'", - machine->initrd_filename); - exit(1); - } + &error_fatal); cmdline_base =3D TARGET_PAGE_ALIGN(initrd_base + initrd_size); } else { cmdline_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size += KERNEL_GAP); diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index a9e706644c..3c02c53c3a 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -198,7 +198,7 @@ static void pegasos_init(MachineState *machine) ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0); if (sz <=3D 0) { sz =3D load_image_targphys(filename, pm->vof ? 0 : prom_addr, PROM= _SIZE, - NULL); + &error_fatal); } if (sz <=3D 0 || sz > PROM_SIZE) { error_report("Could not load firmware '%s'", filename); @@ -302,12 +302,7 @@ static void pegasos_init(MachineState *machine) pm->initrd_addr =3D ROUND_UP(pm->initrd_addr, 4); pm->initrd_addr =3D MAX(pm->initrd_addr, INITRD_MIN_ADDR); sz =3D load_image_targphys(machine->initrd_filename, pm->initrd_ad= dr, - machine->ram_size - pm->initrd_addr, NULL= ); - if (sz <=3D 0) { - error_report("Could not load initrd '%s'", - machine->initrd_filename); - exit(1); - } + machine->ram_size - pm->initrd_addr, &error_fa= tal); pm->initrd_size =3D sz; } =20 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 1c0dadda87..895132da91 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1009,7 +1009,6 @@ static void pnv_init(MachineState *machine) PnvMachineClass *pmc =3D PNV_MACHINE_GET_CLASS(machine); int max_smt_threads =3D pmc->max_smt_threads; char *fw_filename; - long fw_size; uint64_t chip_ram_start =3D 0; int i; char *chip_typename; @@ -1068,26 +1067,14 @@ static void pnv_init(MachineState *machine) exit(1); } =20 - fw_size =3D load_image_targphys(fw_filename, pnv->fw_load_addr, FW_MAX= _SIZE, - NULL); - if (fw_size < 0) { - error_report("Could not load OPAL firmware '%s'", fw_filename); - exit(1); - } + load_image_targphys(fw_filename, pnv->fw_load_addr, FW_MAX_SIZE, + &error_fatal); g_free(fw_filename); =20 /* load kernel */ if (machine->kernel_filename) { - long kernel_size; - - kernel_size =3D load_image_targphys(machine->kernel_filename, - KERNEL_LOAD_ADDR, KERNEL_MAX_SIZ= E, - NULL); - if (kernel_size < 0) { - error_report("Could not load kernel '%s'", - machine->kernel_filename); - exit(1); - } + load_image_targphys(machine->kernel_filename, + KERNEL_LOAD_ADDR, KERNEL_MAX_SIZE, &error_fata= l); } =20 /* load initrd */ @@ -1095,12 +1082,7 @@ static void pnv_init(MachineState *machine) pnv->initrd_base =3D INITRD_LOAD_ADDR; pnv->initrd_size =3D load_image_targphys(machine->initrd_filename, pnv->initrd_base, - INITRD_MAX_SIZE, NULL); - if (pnv->initrd_size < 0) { - error_report("Could not load initial ram disk '%s'", - machine->initrd_filename); - exit(1); - } + INITRD_MAX_SIZE, &error_fat= al); } =20 /* load dtb if passed */ diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 7c66912c10..7e739a2114 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -243,13 +243,7 @@ static void bamboo_init(MachineState *machine) if (initrd_filename) { initrd_size =3D load_image_targphys(initrd_filename, RAMDISK_ADDR, machine->ram_size - RAMDISK_ADDR, - NULL); - - if (initrd_size < 0) { - error_report("could not load ram disk '%s' at %x", - initrd_filename, RAMDISK_ADDR); - exit(1); - } + &error_fatal); } =20 /* If we're loading a kernel directly, we must load the device tree to= o. */ diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 0759e95cb6..c2fe16e985 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -280,7 +280,8 @@ static void ibm_40p_init(MachineState *machine) bios_size =3D load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, N= ULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0); if (bios_size < 0) { - bios_size =3D load_image_targphys(filename, BIOS_ADDR, BIOS_SIZE, = NULL); + bios_size =3D load_image_targphys(filename, BIOS_ADDR, BIOS_SIZE, + &error_fatal); } if (bios_size < 0 || bios_size > BIOS_SIZE) { error_report("Could not load bios image '%s'", filename); @@ -380,12 +381,7 @@ static void ibm_40p_init(MachineState *machine) kernel_size =3D load_image_targphys(machine->kernel_filename, kernel_base, machine->ram_size - kernel_base, - NULL); - if (kernel_size < 0) { - error_report("could not load kernel '%s'", - machine->kernel_filename); - exit(1); - } + &error_fatal); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, kernel_base); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); /* load initrd */ @@ -394,12 +390,7 @@ static void ibm_40p_init(MachineState *machine) initrd_size =3D load_image_targphys(machine->initrd_filename, initrd_base, machine->ram_size - initrd_b= ase, - NULL); - if (initrd_size < 0) { - error_report("could not load initial ram disk '%s'", - machine->initrd_filename); - exit(1); - } + &error_fatal); fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_base); fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size); } diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 68d3eacbff..258d43f8d2 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -495,12 +495,7 @@ static void sam460ex_init(MachineState *machine) initrd_size =3D load_image_targphys(machine->initrd_filename, RAMDISK_ADDR, machine->ram_size - RAMDISK_ADDR, - NULL); - if (initrd_size < 0) { - error_report("could not load ram disk '%s' at %x", - machine->initrd_filename, RAMDISK_ADDR); - exit(1); - } + &error_fatal); } =20 /* If we're loading a kernel directly, we must load the device tree to= o. */ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index cdf2fdeadc..99b843ba2f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2854,11 +2854,7 @@ static void spapr_machine_init(MachineState *machine) error_report("Could not find LPAR firmware '%s'", bios_name); exit(1); } - fw_size =3D load_image_targphys(filename, 0, FW_MAX_SIZE, NULL); - if (fw_size <=3D 0) { - error_report("Could not load LPAR firmware '%s'", filename); - exit(1); - } + fw_size =3D load_image_targphys(filename, 0, FW_MAX_SIZE, &error_fatal= ); =20 /* * if Secure VM (PEF) support is configured, then initialize it @@ -3117,12 +3113,7 @@ static void spapr_machine_init(MachineState *machine) spapr->initrd_size =3D load_image_targphys(initrd_filename, spapr->initrd_base, load_limit - spapr->initrd= _base, - NULL); - if (spapr->initrd_size < 0) { - error_report("could not load initial ram disk '%s'", - initrd_filename); - exit(1); - } + &error_fatal); } } =20 diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 00d9ab7509..43a6d505a8 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -253,7 +253,7 @@ static void virtex_init(MachineState *machine) /* If we failed loading ELF's try a raw image. */ kernel_size =3D load_image_targphys(kernel_filename, boot_offset, - machine->ram_size, NULL); + machine->ram_size, &error_fa= tal); boot_info.bootstrap_pc =3D boot_offset; high =3D boot_info.bootstrap_pc + kernel_size + 8192; } @@ -265,13 +265,7 @@ static void virtex_init(MachineState *machine) initrd_base =3D high =3D ROUND_UP(high, 4); initrd_size =3D load_image_targphys(machine->initrd_filename, high, machine->ram_size - hi= gh, - NULL); - - if (initrd_size < 0) { - error_report("couldn't load ram disk '%s'", - machine->initrd_filename); - exit(1); - } + &error_fatal); high =3D ROUND_UP(high + initrd_size, 4); } =20 --=20 2.51.0