From: Philippe Mathieu-Daudé Date: Mon, 1 Jul 2019 16:26:14 +0000 (+0100) Subject: hw/arm/msf2-som: Exit when the cpu is not the expected one X-Git-Tag: v4.1.0-rc0~31^2~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd97ef044a71123ed53e62f5203e789a6ad3772a;p=thirdparty%2Fqemu.git hw/arm/msf2-som: Exit when the cpu is not the expected one This machine correctly defines its default_cpu_type to cortex-m3 and report an error if the user requested another cpu_type, however it does not exit, and this can confuse users trying to use another core: $ qemu-system-arm -M emcraft-sf2 -cpu cortex-m4 -kernel test-m4.elf qemu-system-arm: This board can only be used with CPU cortex-m3-arm-cpu [output related to M3 core ...] The CPU is indeed a M3 core: (qemu) info qom-tree /machine (emcraft-sf2-machine) /unattached (container) /device[0] (msf2-soc) /armv7m (armv7m) /cpu (cortex-m3-arm-cpu) Add the missing exit() call to return to the shell. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Eduardo Habkost Message-id: 20190617160136.29930-1-philmd@redhat.com Signed-off-by: Peter Maydell --- diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 8c550a8bddc..2c9984bb3b8 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -53,6 +53,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) { error_report("This board can only be used with CPU %s", mc->default_cpu_type); + exit(1); } memory_region_init_ram(ddr, NULL, "ddr-ram", DDR_SIZE,