From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFOV5-0002K7-Vw for qemu-devel@nongnu.org; Fri, 30 Aug 2013 09:12:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFOV0-0006ay-Fj for qemu-devel@nongnu.org; Fri, 30 Aug 2013 09:12:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41107 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFOV0-0006ar-6t for qemu-devel@nongnu.org; Fri, 30 Aug 2013 09:12:26 -0400 Message-ID: <52209A37.9050306@suse.de> Date: Fri, 30 Aug 2013 15:12:23 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1373444183-11557-1-git-send-email-grant.likely@linaro.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2] Make -kernel flag optional on ARM. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Grant Likely Cc: Peter Maydell , qemu-devel@nongnu.org, "patches@linaro.org" Hi, Am 30.08.2013 12:58, schrieb Grant Likely: > Hi Peter, >=20 > What's the status on this patch? Is it able to be merged? I had posted a slightly different patch earlier that just returned immediately when qtest_enabled(). If we go with yours, we might be able to drop mine, have you checked on that? As for your patch I wonder, isn't there anything else to do in the kernel_filename=3D=3DNULL case? Andreas > On Wed, Jul 10, 2013 at 9:16 AM, Grant Likely = wrote: >> Sometimes we want to boot the system via firmware instead of loading a >> kernel into ram with the -kernel parameter. This patch makes the -kern= el >> parameter optional so that a bios image provided by the -pflash flag >> will be executed. >> >> For example: >> qemu-system-arm -M vexpress-a15 -pflash >> >> Note: Currently the file must be at least the size of the emulated fla= sh >> device (ie 64M for VExpress) otherwise QEMU will silently not use the >> data. This will be fixed in a separate patch >> >> v2: just return if the kernel filename isn't provided >> >> Signed-off-by: Grant Likely >> Cc: Peter Maydell >> Cc: qemu-devel@nongnu.org >> --- >> hw/arm/boot.c | 7 ++----- >> 1 file changed, 2 insertions(+), 5 deletions(-) >> >> diff --git a/hw/arm/boot.c b/hw/arm/boot.c >> index 7c0090f..e702fd7 100644 >> --- a/hw/arm/boot.c >> +++ b/hw/arm/boot.c >> @@ -361,11 +361,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot= _info *info) >> int big_endian; >> QemuOpts *machine_opts; >> >> - /* Load the kernel. */ >> - if (!info->kernel_filename) { >> - fprintf(stderr, "Kernel image must be specified\n"); >> - exit(1); >> - } >> + if (!info->kernel_filename) >> + return; >> >> machine_opts =3D qemu_opts_find(qemu_find_opts("machine"), 0); >> if (machine_opts) { >> -- >> 1.8.1.2 --=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