From nobody Sun Apr 28 16:22:19 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 1490885964293486.15124597494116; Thu, 30 Mar 2017 07:59:24 -0700 (PDT) Received: from localhost ([::1]:36181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctbXm-0007uJ-QH for importer@patchew.org; Thu, 30 Mar 2017 10:59:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctbWh-0007KN-G4 for qemu-devel@nongnu.org; Thu, 30 Mar 2017 10:58:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctbWe-0002p1-Gb for qemu-devel@nongnu.org; Thu, 30 Mar 2017 10:58:15 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:35547) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctbWe-0002od-Ai for qemu-devel@nongnu.org; Thu, 30 Mar 2017 10:58:12 -0400 Received: by mail-pg0-x241.google.com with SMTP id g2so10654324pge.2 for ; Thu, 30 Mar 2017 07:58:11 -0700 (PDT) Received: from localhost.localdomain.com ([117.224.220.227]) by smtp.gmail.com with ESMTPSA id d10sm5197514pfl.59.2017.03.30.07.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 07:58:10 -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=q+Pdxw7Le+MbVtE7R9Mm7Fqg2gRc6IQoMXnJL1mWbUY=; b=Q6Y2bBt6zImFvg1Q0TbPnWoVoil6EJuMiHhlvFiVggWPwvqkVEuez2liUBiJUvelkb fg1EGGvDFqgFnNPYpHnghMVDWojYbveh/S+IeqQXOWi4f1bOTDIcnVYdb2Kwf+Mn0xfH YS+kHwrmIibwJmDf8htfqKxanFkDvz46TNUlfVRajojb3XY8NQ9lAvikIeTjpCTbN8EP oXmOkxcWp/wHCZMCN07rRDhtuF9NO0auDuIVOzuuyNXjRvy2J8g+th9i0g1IHLecPjUU wOuKLPqLXThiKfiknBRFW4yQUu3OYdZ9Uqjj51iSEPzQhv51VJz+U9JjreVzycduGATJ xseg== 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=q+Pdxw7Le+MbVtE7R9Mm7Fqg2gRc6IQoMXnJL1mWbUY=; b=QFnEJCPJOjsigcUA5wqkyVxdlGyTP36lIuthZEFAG1k2s2gR7yHbm4D3LcdEot9IRY IjqDA4GUlQjUYE+TuF3K4WDa3v1/3vFsEmsA2IVsumO0AY1/ZjwwdpTTCwTum6Nt8i9H rHn1T2Ii2owETwWdpNEr+tQOIGJ9S2dksBuYIrhcDAVCVRxnYfltfWQzHLl/zEDv4Bnu WvZGiXy1ZEowzHp6tGhupRHRE6x9BuRCuRZ1tP24Fm8bbC4ij8OwlrDe6Fa2PhKJE6NT OK1oDrxlTvUa3O2s/yQz0UvUHjcC2UIFgZhc8hCpQkOh+6HnzzESgINfg4f51QKsVucR CGzw== X-Gm-Message-State: AFeK/H0GnbKog7LOe/NMhT7+5lb8oIDpRpienEeDpHLq5pADxYx5vn/+9Vy/ViNGZQkpiw== X-Received: by 10.84.179.193 with SMTP id b59mr197484plc.56.1490885891062; Thu, 30 Mar 2017 07:58:11 -0700 (PDT) From: Suramya Shah To: qemu-devel@nongnu.org Date: Thu, 30 Mar 2017 20:27:19 +0530 Message-Id: <20170330145719.12068-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] hw/unicore32: fix a kernel_filename!=NULL assertion error in puv3.c 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, 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 --- Running QEMU with qemu-system-unicore32 without the kernel parameter result= s in an assertion error. Fix this by.. 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