[Qemu-devel] [PATCH v2] Make -kernel flag optional on ARM.

[Grant Likely]

Sometimes we want to boot the system via firmware instead of loading a
kernel into ram with the -kernel parameter. This patch makes the -kernel
parameter optional so that a bios image provided by the -pflash flag
will be executed.

For example:
qemu-system-arm -M vexpress-a15 -pflash <filename>

Note: Currently the file must be at least the size of the emulated flash
device (ie 64M for VExpress) otherwise QEMU will silently not use the
data. This will be fixed in a separate patch

v2: just return if the kernel filename isn't provided

Signed-off-by: Grant Likely <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: address@hidden
---
 hw/arm/boot.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 7c0090f..e702fd7 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -361,11 +361,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info 
*info)
     int big_endian;
     QemuOpts *machine_opts;
 
-    /* Load the kernel.  */
-    if (!info->kernel_filename) {
-        fprintf(stderr, "Kernel image must be specified\n");
-        exit(1);
-    }
+    if (!info->kernel_filename)
+        return;
 
     machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
     if (machine_opts) {
-- 
1.8.1.2