[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/10] armv7m: Guard against no -kernel argument
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 02/10] armv7m: Guard against no -kernel argument |
Date: |
Mon, 13 Aug 2012 16:31:51 +0100 |
From: "Peter A. G. Crosthwaite" <address@hidden>
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 <address@hidden>
Tested-by: Markus Armbruster <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/armv7m.c | 5 +++++
1 file changed, 5 insertions(+)
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) {
--
1.7.9.5
- [Qemu-devel] [PULL for-1.2 00/10] arm-devs queue, Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 05/10] hw/sd.c: introduce wrapper for conversion address to wp group, Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 09/10] ssd0323: abort() instead of exit(1) on error., Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 07/10] hw/sd.c: make sd_dataready() return bool, Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 06/10] hw/sd.c: convert binary variables to bool, Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 01/10] hw/armv7m_nvic: Fix incorrect default for num-irqs property, Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 04/10] hw/sd.c: make sd_wp_addr() accept 64 bit address argument, Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 02/10] armv7m: Guard against no -kernel argument,
Peter Maydell <=
- [Qemu-devel] [PATCH 08/10] hw/sd.c: make sd_wp_addr() return bool, Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 03/10] hw/sd.c: convert wp_groups in SDState to bitfield, Peter Maydell, 2012/08/13
- [Qemu-devel] [PATCH 10/10] arm: Move some ARM devices into libhw, Peter Maydell, 2012/08/13
- Re: [Qemu-devel] [PULL for-1.2 00/10] arm-devs queue, Anthony Liguori, 2012/08/13