From: James Hogan Date: Thu, 26 Jun 2014 09:44:24 +0000 (+0100) Subject: mips_malta: Remove incorrect KVM T&E references X-Git-Tag: qemu-xen-4.6.0-rc1~316^2~7 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fbdb1d955511c38e61e3aa3ba4fb3944b126eb28;p=qemu-upstream-4.6-testing.git 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 Cc: Paolo Bonzini Reported-by: Andreas Färber Signed-off-by: James Hogan Reviewed-by: Aurelien Jarno Signed-off-by: Paolo Bonzini --- diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 2868ee5b0..3305a25fc 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. */