Patchwork [02/10] armv7m: Guard against no -kernel argument

login
register
mail settings
Submitter Peter Maydell
Date Aug. 13, 2012, 3:31 p.m.
Message ID <1344871919-31559-3-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/176997/
State New
Headers show

Comments

Peter Maydell - Aug. 13, 2012, 3:31 p.m.
From: "Peter A. G. Crosthwaite" <peter.crosthwaite@petalogix.com>

A -kernel argument must be specified for this machine. Guard against no -kernel
argument. Previously gave an unhelpful "bad address" error message.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Tested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/armv7m.c |    5 +++++
 1 file changed, 5 insertions(+)

Patch

diff --git a/hw/armv7m.c b/hw/armv7m.c
index 8cec78d..9f66667 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -227,6 +227,11 @@  qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
     big_endian = 0;
 #endif
 
+    if (!kernel_filename) {
+        fprintf(stderr, "Guest image must be specified (using -kernel)\n");
+        exit(1);
+    }
+
     image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
                           NULL, big_endian, ELF_MACHINE, 1);
     if (image_size < 0) {