From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Markus Armbruster Date: Wed, 15 Aug 2012 21:17:14 +0200 Message-Id: <1345058260-16229-2-git-send-email-armbru@redhat.com> In-Reply-To: <1345058260-16229-1-git-send-email-armbru@redhat.com> References: <1345058260-16229-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 for-1.2 01/27] puv3: Require -kernel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Guan Xuetao , anthony@codemonkey.ws 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"); } -- 1.7.11.2