From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxyhR-0006by-6i for qemu-devel@nongnu.org; Fri, 20 Jun 2014 09:17:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxyhL-00008W-Ui for qemu-devel@nongnu.org; Fri, 20 Jun 2014 09:17:49 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35738 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxyhL-000086-Nr for qemu-devel@nongnu.org; Fri, 20 Jun 2014 09:17:43 -0400 Message-ID: <53A43476.7060901@suse.de> Date: Fri, 20 Jun 2014 15:17:42 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1403264879-13247-1-git-send-email-james.hogan@imgtec.com> In-Reply-To: <1403264879-13247-1-git-send-email-james.hogan@imgtec.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] hw/mips: malta: Don't boot from flash with KVM T&E List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: James Hogan , qemu-devel@nongnu.org Cc: Paolo Bonzini , Aurelien Jarno Hi, Am 20.06.2014 13:47, schrieb James Hogan: > In KVM trap & emulate (T&E) mode the flash reset region at 0xbfc00000 > isn't executable, which is why the minimal kernel bootloader is loaded > and executed from the last 1MB of DRAM instead. >=20 > Therefore if no kernel is provided on the command line and KVM is > enabled, exit with an error since booting from flash will fail. >=20 > Reported-by: Aurelien Jarno > Signed-off-by: James Hogan > Cc: Paolo Bonzini > --- > hw/mips/mips_malta.c | 6 ++++++ > 1 file changed, 6 insertions(+) Previous commits have used just "mips_malta:", so suggest to do the same for consistency - or clean hw/mips/ dir up by renaming the file to just malta.c and use "mips/malta:". http://git.qemu-project.org/?p=3Dqemu.git;a=3Dhistory;f=3Dhw/mips/mips_ma= lta.c;h=3Df4a7d47129526f6762eccc47251c8cf3cd27f928;hb=3DHEAD That said, > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 8bc5392b4223..91b0ce566111 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1052,6 +1052,12 @@ void mips_malta_init(MachineState *machine) > bootloader_run_addr, kernel_entry); > } > } else { > + /* The flash region isn't executable from a KVM T&E guest */ > + if (kvm_enabled()) { > + error_report("KVM enabled but no -kernel argument was spec= ified. " > + "Booting from flash is not supported with KVM= T&E."); > + exit(1); > + } > /* Load firmware from flash. */ > if (!dinfo) { > /* Load a BIOS image. */ Reviewed-by: Andreas F=E4rber Are users expected to know/understand "KVM T&E"? You don't test for that T&E mode here, so you could either shorten the message to just "KVM" or replace the check with a more specific one. Since qtest does not use KVM on MIPS today, exiting without -kernel should be fine, but may need updating if we ever get to that. Regards, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg