All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] Revert "armv7m: Guard against no -kernel argument"
@ 2019-01-03 14:41 Stefan Hajnoczi
  2019-01-04 15:16 ` Peter Maydell
  0 siblings, 1 reply; 24+ messages in thread
From: Stefan Hajnoczi @ 2019-01-03 14:41 UTC (permalink / raw)
  To: qemu-devel
  Cc: jim, jusual, qemu-arm, Peter Maydell, Alex Bennée,
	Steffen Gortz, Joel Stanley, Stefan Hajnoczi

This reverts commit 01fd41ab3fb69971c24a69ed49cde96086d81278.

The generic loader device (-device loader,file=kernel.bin) can be used
to load a kernel instead of the -kernel option.  Some boards have flash
memory (pflash) that is set via the -pflash or -drive options.

Allow starting QEMU without the -kernel option to accommodate these
scenarios.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/arm/armv7m.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 4bf9131b81..f444652830 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -285,11 +285,6 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size)
     big_endian = 0;
 #endif
 
-    if (!kernel_filename && !qtest_enabled()) {
-        error_report("Guest image must be specified (using -kernel)");
-        exit(1);
-    }
-
     if (arm_feature(&cpu->env, ARM_FEATURE_EL3)) {
         asidx = ARMASIdx_S;
     } else {
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2019-05-03  2:05 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-03 14:41 [Qemu-devel] [PATCH] Revert "armv7m: Guard against no -kernel argument" Stefan Hajnoczi
2019-01-04 15:16 ` Peter Maydell
2019-04-25 18:07   ` Philippe Mathieu-Daudé
2019-04-25 18:07     ` Philippe Mathieu-Daudé
2019-04-25 21:48     ` Philippe Mathieu-Daudé
2019-04-25 21:48       ` Philippe Mathieu-Daudé
2019-04-26  9:17     ` Stefan Hajnoczi
2019-04-26  9:17       ` Stefan Hajnoczi
2019-04-26 11:45       ` Peter Maydell
2019-04-26 11:45         ` Peter Maydell
2019-04-29 12:28         ` Stefan Hajnoczi
2019-04-29 12:28           ` Stefan Hajnoczi
2019-04-29 12:58           ` Peter Maydell
2019-04-29 12:58             ` Peter Maydell
2019-05-01 16:25             ` Stefan Hajnoczi
2019-05-01 16:25               ` Stefan Hajnoczi
2019-04-29 15:07           ` Philippe Mathieu-Daudé
2019-04-29 15:07             ` Philippe Mathieu-Daudé
2019-04-29 12:53       ` Joel Stanley
2019-04-29 12:53         ` Joel Stanley
2019-05-01 16:23         ` Stefan Hajnoczi
2019-05-01 16:23           ` Stefan Hajnoczi
2019-05-03  2:04           ` Joel Stanley
2019-05-03  2:04             ` Joel Stanley

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.