From nobody Mon Apr 7 11:20:38 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
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
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741939418785184.73143739348097;
Fri, 14 Mar 2025 01:03:38 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tt00T-0006Rd-QK; Fri, 14 Mar 2025 04:03:01 -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 <sebastian.huber@embedded-brains.de>)
id 1tt00M-0006QC-Vy
for qemu-devel@nongnu.org; Fri, 14 Mar 2025 04:02:56 -0400
Received: from dedi548.your-server.de ([85.10.215.148])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <sebastian.huber@embedded-brains.de>)
id 1tt00I-00023b-Vl
for qemu-devel@nongnu.org; Fri, 14 Mar 2025 04:02:52 -0400
Received: from sslproxy06.your-server.de ([78.46.172.3])
by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384
(Exim 4.96.2) (envelope-from <sebastian.huber@embedded-brains.de>)
id 1tt00G-0009Ak-2o for qemu-devel@nongnu.org;
Fri, 14 Mar 2025 09:02:48 +0100
Received: from [82.100.198.138] (helo=mail.embedded-brains.de)
by sslproxy06.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384
(Exim 4.96) (envelope-from <sebastian.huber@embedded-brains.de>)
id 1tt00F-000Kr1-2S for qemu-devel@nongnu.org;
Fri, 14 Mar 2025 09:02:48 +0100
Received: from localhost (localhost [127.0.0.1])
by mail.embedded-brains.de (Postfix) with ESMTP id 37066480168
for <qemu-devel@nongnu.org>; Fri, 14 Mar 2025 09:02:48 +0100 (CET)
Received: from mail.embedded-brains.de ([127.0.0.1])
by localhost (zimbra.eb.localhost [127.0.0.1]) (amavis, port 10032)
with ESMTP id PtCnEL96qUBe for <qemu-devel@nongnu.org>;
Fri, 14 Mar 2025 09:02:48 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
by mail.embedded-brains.de (Postfix) with ESMTP id EB9D8480194
for <qemu-devel@nongnu.org>; Fri, 14 Mar 2025 09:02:47 +0100 (CET)
Received: from mail.embedded-brains.de ([127.0.0.1])
by localhost (zimbra.eb.localhost [127.0.0.1]) (amavis, port 10026)
with ESMTP id CDu8IIj2nLly for <qemu-devel@nongnu.org>;
Fri, 14 Mar 2025 09:02:47 +0100 (CET)
Received: from zimbra.eb.localhost (unknown [10.10.171.10])
by mail.embedded-brains.de (Postfix) with ESMTPSA id 36EB1480168
for <qemu-devel@nongnu.org>; Fri, 14 Mar 2025 09:02:46 +0100 (CET)
X-Virus-Scanned: amavis at zimbra.eb.localhost
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
To: qemu-devel@nongnu.org
Subject: [PATCH] hw/riscv: Fix test for microchi-icicle-kit
Date: Fri, 14 Mar 2025 09:02:40 +0100
Message-ID: <20250314080240.26383-1-sebastian.huber@embedded-brains.de>
X-Mailer: git-send-email 2.43.0
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Authenticated-Sender: smtp-embedded@poldi-networks.de
X-Virus-Scanned: Clear (ClamAV 1.0.7/27576/Thu Mar 13 09:48:52 2025)
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=85.10.215.148;
envelope-from=sebastian.huber@embedded-brains.de; helo=dedi548.your-server.de
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZM-MESSAGEID: 1741939422305019100
Content-Type: text/plain; charset="utf-8"
Fix this test failure:
$ QTEST_QEMU_BINARY=3D./build/qemu-system-riscv64 \
./build/tests/qtest/qom-test
(...)
# slow test /riscv64/qom/amd-microblaze-v-generic executed in 2.28 \
secs
# starting QEMU: exec ./build/qemu-system-riscv64 -qtest
unix:/tmp/qtest-1361875.sock -qtest-log /dev/null -chardev \
socket,path=3D/tmp/qtest-1361875.qmp,id=3Dchar0 -mon \
chardev=3Dchar0,mode=3Dcontrol -display none -audio none -machine \
microchip-icicle-kit -accel qtest
**
ERROR:../hw/riscv/boot.c:164:riscv_load_firmware: assertion failed: \
(firmware_filename !=3D NULL)
Bail out! ERROR:../hw/riscv/boot.c:164:riscv_load_firmware: \
assertion failed: (firmware_filename !=3D NULL)
Use an approach similar to riscv_find_and_load_firmware().
Reported-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
---
hw/riscv/microchip_pfsoc.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index 9068eed780..616bb63982 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -609,12 +609,14 @@ static void microchip_icicle_kit_machine_init(Machine=
State *machine)
}
=20
/* Load the firmware if necessary */
+ firmware_end_addr =3D firmware_load_addr;
if (firmware_name) {
- const char *filename =3D riscv_find_firmware(firmware_name, NULL);
- firmware_end_addr =3D riscv_load_firmware(filename, &firmware_load=
_addr,
- NULL);
- } else {
- firmware_end_addr =3D firmware_load_addr;
+ char *filename =3D riscv_find_firmware(firmware_name, NULL);
+ if (filename) {
+ firmware_end_addr =3D riscv_load_firmware(filename,
+ &firmware_load_addr, N=
ULL);
+ g_free(filename);
+ }
}
=20
riscv_boot_info_init(&boot_info, &s->soc.u_cpus);
--=20
2.43.0