diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2019-01-07 15:23:46 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-07 15:23:46 +0000 |
| commit | c38c37ac979c54b09293eb11061aa0e534e0f3bf (patch) | |
| tree | 11c10c8ee61f7ab7eed1b86286cf732057a49777 /hw/arm | |
| parent | 816fd397a116b3a3850bcc4e3f66e15981a4bae8 (diff) | |
Revert "armv7m: Guard against no -kernel argument"
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>
Message-id: 20190103144124.18917-1-stefanha@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/armv7m.c | 5 |
1 files changed, 0 insertions, 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 { |