From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZluS-0001PK-7Z for qemu-devel@nongnu.org; Fri, 25 Oct 2013 14:14:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZluR-0006cl-Hr for qemu-devel@nongnu.org; Fri, 25 Oct 2013 14:14:56 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:39254 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZluR-0006cU-Ar for qemu-devel@nongnu.org; Fri, 25 Oct 2013 14:14:55 -0400 From: Peter Maydell Date: Fri, 25 Oct 2013 19:07:24 +0100 Message-Id: <1382724449-11944-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1382724449-11944-1-git-send-email-peter.maydell@linaro.org> References: <1382724449-11944-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 1/6] hw/arm/boot: Make user not specifying a kernel not an error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org Typically ARM boards will have some kind of flash which might contain a boot ROM; it's therefore a valid use case to provide only an image for the boot ROM and not require QEMU's internal boot loader at all. Remove the fatal error if -kernel isn't specified. Signed-off-by: Peter Maydell Message-id: 1379980897-21277-2-git-send-email-peter.maydell@linaro.org --- hw/arm/boot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 1e313af..583ec79 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -354,8 +354,10 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) /* Load the kernel. */ if (!info->kernel_filename) { - fprintf(stderr, "Kernel image must be specified\n"); - exit(1); + /* If no kernel specified, do nothing; we will start from address 0 + * (typically a boot ROM image) in the same way as hardware. + */ + return; } info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb"); -- 1.7.9.5