From nobody Wed May 1 07:23:44 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 1490890796486910.9360085811284; Thu, 30 Mar 2017 09:19:56 -0700 (PDT) Received: from localhost ([::1]:36660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctcnj-0004sM-Cz for importer@patchew.org; Thu, 30 Mar 2017 12:19:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctcmc-0004GC-NS for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:18:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctcmX-0003qR-QH for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:18:46 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:32990) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctcmX-0003p2-Ky for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:18:41 -0400 Received: by mail-pg0-x241.google.com with SMTP id 79so11210137pgf.0 for ; Thu, 30 Mar 2017 09:18:41 -0700 (PDT) Received: from localhost.localdomain.com ([117.224.190.38]) by smtp.gmail.com with ESMTPSA id n85sm5495442pfi.101.2017.03.30.09.18.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 09:18:40 -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=UJhve94Icf5JfhgszdPg/HYD0uHimLXVGi0c13qV8ss=; b=jPQpZnJ8G73vlpEW0dnmgo/IS/q/YBYH6eanJvSiyZnvLhc7Doy1iPn/eoQTxLHGqk wqXhn+SlYh+lqzu7OIhuu66QOkT8/lD00+0NJl4qG3vl/QFObEf/iYsSFM/HRa7/J08h Hds1cOrm3KVxv8KSpTrAJDtaf84SyocKKmH/94wmP327X/AUUb4kT799+gevbvFG8+ll yaV4pEbJBxoAAzUQ2eBaNd7k5W+NS6LQDRaroo65iBFZOxZoZeJ7xjDahgwihjk0fu7U hWjGw53Zj98aVJJPt4MJW2Tg7XqZGZFTGCq+exhMGBKTrnkaKeZzGvaeijXEFimNzgH2 SO8g== 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=UJhve94Icf5JfhgszdPg/HYD0uHimLXVGi0c13qV8ss=; b=rVOzY8SV93tuq5xdvPJJm5redJ4GSU3T5v4WZXmk4G4GSO3qaKW/anVCYqOVl5r5t6 nX6ujY70lbXxVuJ3bJJM+eTqpFmOzC/CuII2LJ8Q/9xza6vxqvCNo9aLTWw/U+77qgAH CEVsWSl/uEcYQYtT6jnuZSymy3FoGtir649dnpcEfAhdYh6/Mb/Jvm3V/F+YXIFYyGvn IzLFPws7P6SKr1P1738wvpkVhrY0TRnasbZI6UIOVfvIFlXAAcza2n8DsMH3LPpd3rpf p8fb/pbCXCrNOLA2wkiiFRX6arR6iZFJoPGJxzVJGU4g0h1Y6rrnoCL7si6taWD9589x yZDQ== X-Gm-Message-State: AFeK/H3you9DokIk1icnz+1EpVXgfpTZTcjptpnCvu598i5NGLIhG0M66XdtbcT5Y5BrNw== X-Received: by 10.98.79.65 with SMTP id d62mr521384pfb.64.1490890720806; Thu, 30 Mar 2017 09:18:40 -0700 (PDT) From: Suramya Shah To: qemu-devel@nongnu.org Date: Thu, 30 Mar 2017 21:47:56 +0530 Message-Id: <20170330161756.26084-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 v3] 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 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