From patchwork Wed Aug 15 19:17:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 177787 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 37DD72C0084 for ; Thu, 16 Aug 2012 05:55:11 +1000 (EST) Received: from localhost ([::1]:57542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1j7L-0002Df-BF for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 15:18:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1j6C-0007xx-7J for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:17:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1j69-0004Ga-3A for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:17:48 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:35605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1j68-0004G5-SH for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:17:45 -0400 Received: from blackfin.pond.sub.org (p57B0FBD1.dip.t-dialin.net [87.176.251.209]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 234649FE57; Wed, 15 Aug 2012 21:17:41 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8C4492005B; Wed, 15 Aug 2012 21:17:40 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2012 21:17:14 +0200 Message-Id: <1345058260-16229-2-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1345058260-16229-1-git-send-email-armbru@redhat.com> References: <1345058260-16229-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: Guan Xuetao , anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v2 for-1.2 01/27] puv3: Require -kernel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Without it, puv3_load_kernel() asserts. Cc: Guan Xuetao Suppress default floppy, CD-ROM and SD card drives for machine puv3. Signed-off-by: Markus Armbruster --- hw/puv3.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/puv3.c b/hw/puv3.c index 43f7216..8aad17f 100644 --- a/hw/puv3.c +++ b/hw/puv3.c @@ -97,6 +97,11 @@ static void puv3_init(ram_addr_t ram_size, const char *boot_device, { CPUUniCore32State *env; + if (!kernel_filename) { + fprintf(stderr, "Kernel image must be specified\n"); + exit(1); + } + if (initrd_filename) { hw_error("Please use kernel built-in initramdisk.\n"); }