diff options
| author | James Hogan <james.hogan@imgtec.com> | 2014-06-26 10:44:24 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-07-09 18:17:08 +0200 |
| commit | fbdb1d955511c38e61e3aa3ba4fb3944b126eb28 (patch) | |
| tree | 607f617318ea0bed740852b21eb8b14931b165c9 /hw/mips | |
| parent | 0e928b12c94a4eea56028dec676422b165063ea5 (diff) | |
| download | qemu-fbdb1d955511c38e61e3aa3ba4fb3944b126eb28.tar.gz qemu-fbdb1d955511c38e61e3aa3ba4fb3944b126eb28.tar.bz2 qemu-fbdb1d955511c38e61e3aa3ba4fb3944b126eb28.zip | |
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>
Diffstat (limited to 'hw/mips')
| -rw-r--r-- | hw/mips/mips_malta.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 2868ee5b03..3305a25fc1 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1028,7 +1028,7 @@ void mips_malta_init(MachineState *machine) fl_idx++; if (kernel_filename) { 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()) { ram_low_size -= 0x100000; bootloader_run_addr = 0x40000000 + ram_low_size; @@ -1052,10 +1052,10 @@ void mips_malta_init(MachineState *machine) bootloader_run_addr, kernel_entry); } } 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()) { 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); } /* Load firmware from flash. */ |