From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0Rkq-0006DV-7B for qemu-devel@nongnu.org; Fri, 27 Jun 2014 04:43:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0Rkp-00059x-3b for qemu-devel@nongnu.org; Fri, 27 Jun 2014 04:43:32 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:53699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0Rko-00059s-Ue for qemu-devel@nongnu.org; Fri, 27 Jun 2014 04:43:31 -0400 Date: Fri, 27 Jun 2014 10:43:30 +0200 From: Aurelien Jarno Message-ID: <20140627084330.GC10041@hall.aurel32.net> References: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com> <1403775865-25219-4-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1403775865-25219-4-git-send-email-james.hogan@imgtec.com> Sender: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH 3/4] mips_malta: Remove incorrect KVM T&E references List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: James Hogan Cc: Paolo Bonzini , qemu-devel@nongnu.org, kvm@vger.kernel.org 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 > Signed-off-by: James Hogan > Cc: Aurelien Jarno > Cc: Paolo Bonzini > --- > 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 Jarno GPG: 4096R/1DDD8C9B aurelien@aurel32.net http://www.aurel32.net