mips_malta: Remove incorrect KVM T&E references
Fix the error message and code comments relating to KVM not supporting booting from the flash mapping when no kernel is provided. The issue is a general MIPS KVM issue and isn't specific to the Trap & Emulate version of MIPS KVM. Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: Paolo Bonzini <pbonzini@redhat.com> Reported-by: Andreas Färber <afaerber@suse.de> Signed-off-by: James Hogan <james.hogan@imgtec.com> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
0e928b12c9
commit
fbdb1d9555
|
@ -1028,7 +1028,7 @@ void mips_malta_init(MachineState *machine)
|
||||||
fl_idx++;
|
fl_idx++;
|
||||||
if (kernel_filename) {
|
if (kernel_filename) {
|
||||||
ram_low_size = MIN(ram_size, 256 << 20);
|
ram_low_size = MIN(ram_size, 256 << 20);
|
||||||
/* For KVM T&E we reserve 1MB of RAM for running bootloader */
|
/* For KVM we reserve 1MB of RAM for running bootloader */
|
||||||
if (kvm_enabled()) {
|
if (kvm_enabled()) {
|
||||||
ram_low_size -= 0x100000;
|
ram_low_size -= 0x100000;
|
||||||
bootloader_run_addr = 0x40000000 + ram_low_size;
|
bootloader_run_addr = 0x40000000 + ram_low_size;
|
||||||
|
@ -1052,10 +1052,10 @@ void mips_malta_init(MachineState *machine)
|
||||||
bootloader_run_addr, kernel_entry);
|
bootloader_run_addr, kernel_entry);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* The flash region isn't executable from a KVM T&E guest */
|
/* The flash region isn't executable from a KVM guest */
|
||||||
if (kvm_enabled()) {
|
if (kvm_enabled()) {
|
||||||
error_report("KVM enabled but no -kernel argument was specified. "
|
error_report("KVM enabled but no -kernel argument was specified. "
|
||||||
"Booting from flash is not supported with KVM T&E.");
|
"Booting from flash is not supported with KVM.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
/* Load firmware from flash. */
|
/* Load firmware from flash. */
|
||||||
|
|
Loading…
Reference in New Issue