From 3c5d0be553b18d47361ac3a701e2bff86b8256b0 Mon Sep 17 00:00:00 2001 From: James Hogan Date: Fri, 20 Jun 2014 12:47:59 +0100 Subject: hw/mips: malta: Don't boot from flash with KVM T&E In KVM trap & emulate (T&E) mode the flash reset region at 0xbfc00000 isn't executable, which is why the minimal kernel bootloader is loaded and executed from the last 1MB of DRAM instead. Therefore if no kernel is provided on the command line and KVM is enabled, exit with an error since booting from flash will fail. Reported-by: Aurelien Jarno Signed-off-by: James Hogan Cc: Paolo Bonzini Signed-off-by: Paolo Bonzini --- hw/mips/mips_malta.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 8bc5392..91b0ce5 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1052,6 +1052,12 @@ void mips_malta_init(MachineState *machine) bootloader_run_addr, kernel_entry); } } else { + /* The flash region isn't executable from a KVM T&E guest */ + if (kvm_enabled()) { + error_report("KVM enabled but no -kernel argument was specified. " + "Booting from flash is not supported with KVM T&E."); + exit(1); + } /* Load firmware from flash. */ if (!dinfo) { /* Load a BIOS image. */ -- cgit v1.1