From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50427)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1VO7U7-0002K4-ND
	for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:51:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1VO7U2-0004x9-Dr
	for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:51:35 -0400
Received: from cantor2.suse.de ([195.135.220.15]:39173 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1VO7U2-0004x3-7N
	for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:51:30 -0400
Message-ID: <5240556F.1070104@suse.de>
Date: Mon, 23 Sep 2013 16:51:27 +0200
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1379943352-1979-1-git-send-email-afaerber@suse.de>
	<1379943352-1979-3-git-send-email-afaerber@suse.de>
In-Reply-To: <1379943352-1979-3-git-send-email-afaerber@suse.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v3 02/18] arm/boot: Turn arm_load_kernel()
 into no-op for qtest without -kernel
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Grant Likely <grant.likely@linaro.org>, qemu-devel@nongnu.org

Am 23.09.2013 15:35, schrieb Andreas F=C3=A4rber:
> Signed-off-by: Andreas F=C3=A4rber <afaerber@suse.de>
> ---
>  hw/arm/boot.c | 4 ++++
>  1 file changed, 4 insertions(+)

Sorry, I forgot that Grant Likely had an alternative patch [1] not
restricted to qtest. Last thing I read was that PMM had similar/further
patches. How to proceed?

Andreas

[1] http://patchwork.ozlabs.org/patch/257997/

>=20
> diff --git a/hw/arm/boot.c b/hw/arm/boot.c
> index 1e313af..0c3dc5f 100644
> --- a/hw/arm/boot.c
> +++ b/hw/arm/boot.c
> @@ -15,6 +15,7 @@
>  #include "hw/loader.h"
>  #include "elf.h"
>  #include "sysemu/device_tree.h"
> +#include "sysemu/qtest.h"
>  #include "qemu/config-file.h"
> =20
>  #define KERNEL_ARGS_ADDR 0x100
> @@ -354,6 +355,9 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_i=
nfo *info)
> =20
>      /* Load the kernel.  */
>      if (!info->kernel_filename) {
> +        if (qtest_enabled()) {
> +            return;
> +        }
>          fprintf(stderr, "Kernel image must be specified\n");
>          exit(1);
>      }
>=20


--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC=
rnberg