On Thu, Jun 26, 2014 at 10:44:24AM +0100, James Hogan wrote:
> 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.
>
> Reported-by: Andreas Färber <afaerber@xxxxxxx>
> Signed-off-by: James Hogan <james.hogan@xxxxxxxxxx>
> Cc: Aurelien Jarno <aurelien@xxxxxxxxxxx>
> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> ---
> hw/mips/mips_malta.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index c0841991f4e9..76cf5f2c48f4 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -1033,7 +1033,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;
> @@ -1057,10 +1057,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. */
Reviewed-by: Aurelien Jarno <aurelien@xxxxxxxxxxx>
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurelien@xxxxxxxxxxx http://www.aurel32.net
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
