summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--hw/mips/mips_malta.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 8bc5392b42..91b0ce5661 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. */