From nobody Wed May 1 05:20:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149088874943348.3588880223474; Thu, 30 Mar 2017 08:45:49 -0700 (PDT) Received: from localhost ([::1]:36403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctcGi-0004v8-3I for importer@patchew.org; Thu, 30 Mar 2017 11:45:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctcG0-0004YM-6C for qemu-devel@nongnu.org; Thu, 30 Mar 2017 11:45:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctcFx-0004pC-0v for qemu-devel@nongnu.org; Thu, 30 Mar 2017 11:45:04 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:34612) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctcFw-0004oi-Rr for qemu-devel@nongnu.org; Thu, 30 Mar 2017 11:45:00 -0400 Received: by mail-pg0-x241.google.com with SMTP id o123so10986100pga.1 for ; Thu, 30 Mar 2017 08:45:00 -0700 (PDT) Received: from localhost.localdomain.com ([117.224.190.38]) by smtp.gmail.com with ESMTPSA id q23sm5387475pfg.63.2017.03.30.08.44.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 08:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=L/8xmV2Rtc0nH/ZEJhn349npJ8X021xg8p4l3CRsJ6o=; b=WvGNECkD24eoRdnBZJ+D/a1OqmpgOphzdH0E/WizaxvMlo5LoENkKHl2zqVyWszJeJ BxyZ7i3hKLSYRLDigskIK4FDpU/YtvFVgu9Je+qhWi2U9kD1vla+ncfVVVIEUlJTP5in IuCDNhUlKz6z9pG5K7Ao07Akdh2ZmXEkU9oKtnVmxqxhpVI7ZAAulZ6B06F+6Jrcrh4r KnA6LPPtTjGSL+AoQ51dStRLNRb8C8YcqbvgQ58px7/EbETANAi4pBqDnWZ9MuDV0wJ2 Z2Nm7ydD9vK+AIxwlk24z37wI1pOdTQCsBCYhIX+44sOBsPkH4z6PcblmTRpcXoUtidw Pyhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=L/8xmV2Rtc0nH/ZEJhn349npJ8X021xg8p4l3CRsJ6o=; b=G+hZZEBFHQnCUL1mx+F2O2Ndw0/RXwBYFDcMvaFjV6qwRhYpMYyRsh1/R4RA8T1S83 RmgyeLc0VFHc4p1f3mVvAZTNcG84pArkGYQCyt1yanou2+UiYUsw+CLPSvk39eKgk9kP cavOPz+233Q1SztGLZZwWJjLrYHwXkYbAWl0rVLz+O8xUg7V/3Jpb7I4Wmlw++uMgEU6 MXkI9fUIqZQwxAiadclKec4q1V4TDb5wf7cewHDtKmI0hi0WurhtODYZ1jYfwkiWpkBu dMhqomntx11VL8orJRxraz5KlBrn+AaEMmbJBm5Vk1oFLoWG0qaMpthmZ3l0vT5WSzgu Le8g== X-Gm-Message-State: AFeK/H1FpBBiAPVxAZQG6/j7RVGM5FFLIBiH0cY1yN9VLS482qSzedgEX54RU5S1CE3tQQ== X-Received: by 10.98.160.196 with SMTP id p65mr344302pfl.75.1490888699973; Thu, 30 Mar 2017 08:44:59 -0700 (PDT) From: Suramya Shah To: qemu-devel@nongnu.org Date: Thu, 30 Mar 2017 21:14:13 +0530 Message-Id: <20170330154413.22014-1-shah.suramya@gmail.com> X-Mailer: git-send-email 2.9.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH v2] hw/unicore32: remove wrong assertion in puv machine init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcel@redhat.com, gxt@mprc.pku.edu.cn, Suramya Shah Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Suramya Shah Reviewed-by: Marcel Apfelbaum Running QEMU with qemu-system-unicore32 without the kernel parameter result= s in an assertion error. Assert should not be used to check user provided parameters. Report an erro= r and exit instead --- hw/unicore32/puv3.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 032078f..2c17cc9 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -93,8 +93,11 @@ static void puv3_load_kernel(const char *kernel_filename) if (kernel_filename =3D=3D NULL && qtest_enabled()) { return; } - assert(kernel_filename !=3D NULL); - + if (kernel_filename =3D=3D NULL) { + error_report("No kernel found"); + exit(1); + } + /* only zImage format supported */ size =3D load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR, KERNEL_MAX_SIZE); --=20 2.9.3