From nobody Sat Apr 27 09:25:18 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 1490892706727320.2243689390315; Thu, 30 Mar 2017 09:51:46 -0700 (PDT) Received: from localhost ([::1]:36785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctdIX-0000l8-A5 for importer@patchew.org; Thu, 30 Mar 2017 12:51:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctdHp-0000TA-3E for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:51:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctdHm-0000ZO-0F for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:51:01 -0400 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:36335) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctdHl-0000ZC-M6 for qemu-devel@nongnu.org; Thu, 30 Mar 2017 12:50:57 -0400 Received: by mail-pg0-x243.google.com with SMTP id 81so11405096pgh.3 for ; Thu, 30 Mar 2017 09:50:57 -0700 (PDT) Received: from localhost.localdomain.com ([117.224.190.38]) by smtp.gmail.com with ESMTPSA id r12sm5651749pgn.26.2017.03.30.09.50.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 09:50:56 -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=+BLqkBUaC05IlzCiI5UA69QJHIbAe6ZajJrkas3eSWQ=; b=trg+BbkKB+V/Ouqm/b1JlFR8mJblxr5158reSfO4F34Tk5TmBGadzPIouF9g80Khfz ob/fzrZdxasp1IiWK7lmryr+ZJh1/9f8kBmszEYB1a+Iq1OopoI0Z1L3Q+zHhfrRxlzc hNA8/coCsb70K+xvC7A6Ora5z12uozk3w/CNVIiaqJZqNA+ULPUyHtlGCerlCrVaY6zm UkocHI3qlDt424cyOkkoT3A1x2rJkb90EB/tgOFJXNwwxrZxJQ1vaM+JzTtVcwRf9ZbS zr5YYwuENZuDyjmooBcxxiMNevjHkOwKtZ/+KjlDGI8vxY1TL0fozDfSS2udpVC2AY8V VOOA== 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=+BLqkBUaC05IlzCiI5UA69QJHIbAe6ZajJrkas3eSWQ=; b=iY1qiAqqIbYMUweQp1P61+uYm0VQGdZBWByb6W0LRNeNHGN6rq4CPzGqaxi5AU/exr MRw2ZJIGuzfcUHBMFCjHsuLYsl+r4xwpqcKBRNodYD6FeKqjtigdLC4swUmqFXu0F6nh O9vEMDVpPWEmkvG0MgNXUTfoqT5aGLmQ568kbr8zZIeoPzxXYlN856wg+8wMHFUXyP7A jyLTqrljdup5S/2tTNHFteDzjbKoDggshZkmg2W0g/9RW2yQ4OG4waayQPJhgx0Re8zA 3ZGSADv8bYjhR2hXVFkJrHOOOQFPxDZqL3vyp8WmnfmhMgYwvGQE+obssIl+GgPK9gca HBSg== X-Gm-Message-State: AFeK/H0drBwZMNiO3kCLKeh0jqhvUL7vgsTjgWjcLpFNQq/p00IGCS5/AMvnsJcQeh9lfg== X-Received: by 10.98.8.129 with SMTP id 1mr666309pfi.268.1490892656622; Thu, 30 Mar 2017 09:50:56 -0700 (PDT) From: Suramya Shah To: qemu-devel@nongnu.org Date: Thu, 30 Mar 2017 22:20:08 +0530 Message-Id: <20170330165008.26419-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::243 Subject: [Qemu-devel] [PATCH v5] 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" 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 Signed-off-by: Suramya Shah Acked-by: Guan Xuetao Reviewed-by: Marcel Apfelbaum --- 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