From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0x0Z-00083i-W8 for qemu-devel@nongnu.org; Mon, 13 Aug 2012 11:56:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0x0X-00077f-As for qemu-devel@nongnu.org; Mon, 13 Aug 2012 11:56:47 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:40950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0x0X-000773-3y for qemu-devel@nongnu.org; Mon, 13 Aug 2012 11:56:45 -0400 From: Peter Maydell Date: Mon, 13 Aug 2012 16:31:51 +0100 Message-Id: <1344871919-31559-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1344871919-31559-1-git-send-email-peter.maydell@linaro.org> References: <1344871919-31559-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 02/10] armv7m: Guard against no -kernel argument List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , Blue Swirl Cc: qemu-devel@nongnu.org, Paul Brook From: "Peter A. G. Crosthwaite" 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 Tested-by: Markus Armbruster Signed-off-by: Peter Maydell --- 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