[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/14] hw/mips: malta: Don't boot from flash with KVM
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 14/14] hw/mips: malta: Don't boot from flash with KVM T&E |
Date: |
Fri, 20 Jun 2014 14:11:23 +0200 |
From: James Hogan <address@hidden>
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 <address@hidden>
Signed-off-by: James Hogan <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/mips/mips_malta.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
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. */
--
1.7.1
- [Qemu-devel] [PULL 04/14] hw/mips: Add API to convert KVM guest KSEG0 <-> GPA, (continued)
- [Qemu-devel] [PULL 04/14] hw/mips: Add API to convert KVM guest KSEG0 <-> GPA, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 05/14] target-mips: get_physical_address: Add defines for segment bases, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 06/14] target-mips: get_physical_address: Add KVM awareness, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 07/14] kvm: Allow arch to set sigmask length, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 08/14] target-mips: kvm: Add main KVM support for MIPS, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 09/14] target-mips: Call kvm_mips_reset_vcpu() from mips_cpu_reset(), Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 10/14] hw/mips: In KVM mode, inject IRQ2 (I/O) interrupts via ioctls, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 11/14] hw/mips: malta: Add KVM support, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 12/14] target-mips: Enable KVM support in build system, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 13/14] MAINTAINERS: Add entry for MIPS KVM, Paolo Bonzini, 2014/06/20
- [Qemu-devel] [PULL 14/14] hw/mips: malta: Don't boot from flash with KVM T&E,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 00/14] Pending KVM patches for 2.1, Peter Maydell, 2014/06/20