From nobody Mon Feb 9 09:08:55 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856445; cv=none; d=zohomail.com; s=zohoarc; b=Y7a9HK3qQbRTNjQbiRlMiVjRVzf3vk5ESLxW0EG0FCfeSRDF8LBgT10+S7KWp4tE+AWWyAB9vEjuzEeifjE/AWA2L8zZiEF5zzBiLmYtvzzaOP4LK24Yd9UMa7Wyk07K8kUv633hJrsJ64tYQDg1aa/czUI9Eu/VWyHHfFIcfVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856445; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Bcl23ps/bK4EauZ2W48nVvpVqg5Y5Ps47IeSDNjIedc=; b=kvioAzi+ZhEzUSvFokVCw2MHU4OlqIx0xZhDPVLIPd4DZthYP+dO6B84R0U/ynGhgahnDzOsarJs6Ql+Wia3c8Dr+uvjvWo7y0A4s/VoMqHYvmvoIg4IypUaYCs3YTrh7Vgnz4vju5iOQ9KQpJmoUpcE7yNt/g8uDzvDK+OYNx8= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856445447381.98218500800203; Wed, 7 Jan 2026 23:14:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6U-0006tu-KM; Thu, 08 Jan 2026 02:06:42 -0500 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 1vdk6Q-0006kj-2X for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6M-0006bI-Nk for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-wbLIreZFM1W4nEQg2GwIag-1; Thu, 08 Jan 2026 02:06:30 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 373C21956094; Thu, 8 Jan 2026 07:06:29 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 59BC9180009E; Thu, 8 Jan 2026 07:06:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E8C1821E61A5; Thu, 08 Jan 2026 08:06:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bcl23ps/bK4EauZ2W48nVvpVqg5Y5Ps47IeSDNjIedc=; b=hL1FSdZE61TiNjt/6U39Phak3LndEbEq6+JdWc4mjqRqYsDH4kcC+RCh8N8Dpc2+MYwrX0 WoSOnAm7QSt4VXoYJG+as3b+mx95t6Oiialvuh+1RlDiUyLNr0HX/UTizSx7LaVnPtVW+C gRt9PJgVkLx7Xsrr6p8Vrnav+N4h8Dc= X-MC-Unique: wbLIreZFM1W4nEQg2GwIag-1 X-Mimecast-MFC-AGG-ID: wbLIreZFM1W4nEQg2GwIag_1767855989 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Vladimir Sementsov-Ogievskiy , Peter Xu , Daniel Henrique Barboza , Zhao Liu Subject: [PULL v2 01/17] hw/core/loader: Make load_elf_hdr() return bool, simplify caller Date: Thu, 8 Jan 2026 08:06:09 +0100 Message-ID: <20260108070625.1586474-2-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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 @redhat.com) X-ZM-MESSAGEID: 1767856446592158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-ID: <20251119130855.105479-2-armbru@redhat.com> Reviewed-by: Richard Henderson Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu Reviewed-by: Daniel Henrique Barboza Reviewed-by: Zhao Liu --- include/hw/core/loader.h | 4 +++- hw/arm/boot.c | 6 +----- hw/core/loader.c | 8 ++++++-- hw/riscv/spike.c | 10 +--------- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/include/hw/core/loader.h b/include/hw/core/loader.h index d035e72748..6f91703503 100644 --- a/include/hw/core/loader.h +++ b/include/hw/core/loader.h @@ -188,8 +188,10 @@ ssize_t load_elf(const char *filename, * * Inspect an ELF file's header. Read its full header contents into a * buffer and/or determine if the ELF is 64bit. + * + * Returns true on success, false on failure. */ -void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p); +bool load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p); =20 ssize_t load_aout(const char *filename, hwaddr addr, int max_sz, bool big_endian, hwaddr target_page_size); diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 0ba3adaf81..e22609de93 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -766,16 +766,12 @@ static ssize_t arm_load_elf(struct arm_boot_info *inf= o, uint64_t *pentry, int data_swab =3D 0; int elf_data_order; ssize_t ret; - Error *err =3D NULL; =20 - - load_elf_hdr(info->kernel_filename, &elf_header, &elf_is64, &err); - if (err) { + if (!load_elf_hdr(info->kernel_filename, &elf_header, &elf_is64, NULL)= ) { /* * If the file is not an ELF file we silently return. * The caller will fall back to try other formats. */ - error_free(err); return -1; } =20 diff --git a/hw/core/loader.c b/hw/core/loader.c index 8252616fdd..89d67d2760 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -364,8 +364,9 @@ const char *load_elf_strerror(ssize_t error) } } =20 -void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p) +bool load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p) { + bool ok =3D false; int fd; uint8_t e_ident_local[EI_NIDENT]; uint8_t *e_ident; @@ -380,7 +381,7 @@ void load_elf_hdr(const char *filename, void *hdr, bool= *is64, Error **errp) fd =3D open(filename, O_RDONLY | O_BINARY); if (fd < 0) { error_setg_errno(errp, errno, "Failed to open file: %s", filename); - return; + return false; } if (read(fd, hdr, EI_NIDENT) !=3D EI_NIDENT) { error_setg_errno(errp, errno, "Failed to read file: %s", filename); @@ -415,8 +416,11 @@ void load_elf_hdr(const char *filename, void *hdr, boo= l *is64, Error **errp) off +=3D br; } =20 + ok =3D true; + fail: close(fd); + return ok; } =20 /* return < 0 if error, otherwise the number of bytes loaded in memory */ diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 1493b928da..35c696f891 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -180,15 +180,7 @@ static void create_fdt(SpikeState *s, const MemMapEntr= y *memmap, =20 static bool spike_test_elf_image(char *filename) { - Error *err =3D NULL; - - load_elf_hdr(filename, NULL, NULL, &err); - if (err) { - error_free(err); - return false; - } else { - return true; - } + return load_elf_hdr(filename, NULL, NULL, NULL); } =20 static void spike_board_init(MachineState *machine) --=20 2.52.0