From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:47641)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SaO7r-00075o-Hg
	for qemu-devel@nongnu.org; Fri, 01 Jun 2012 05:26:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SaO7l-00083X-6T
	for qemu-devel@nongnu.org; Fri, 01 Jun 2012 05:26:31 -0400
Received: from cantor2.suse.de ([195.135.220.15]:48366 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SaO7k-000827-U1
	for qemu-devel@nongnu.org; Fri, 01 Jun 2012 05:26:25 -0400
Message-ID: <4FC88ABA.2070008@suse.de>
Date: Fri, 01 Jun 2012 11:26:18 +0200
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <cover.1338512893.git.peter.crosthwaite@petalogix.com>
	<f7256b2be069a80037b977e3f66f4d51418e35d0.1338512893.git.peter.crosthwaite@petalogix.com>
In-Reply-To: <f7256b2be069a80037b977e3f66f4d51418e35d0.1338512893.git.peter.crosthwaite@petalogix.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [RFC PATCH V1 1/2] arm_boot: added linux switch
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 A. G. Crosthwaite" <peter.crosthwaite@petalogix.com>
Cc: edgar.iglesias@gmail.com, qemu-devel@nongnu.org, john.williams@petalogix.com, peter.maydell@linaro.org

Am 01.06.2012 03:16, schrieb Peter A. G. Crosthwaite:
> Added a switch to tell the bootloader that the image is linux and shoul=
d be
> bootstrapped as such. This is needed to boot an elf that is linux.
>=20
> Syntax would be:
>=20
> qemu-system-arm ... -kernel linux.elf -machine linux=3Don
>=20
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com=
>
> ---
>  hw/arm_boot.c |    1 +
>  qemu-config.c |    4 ++++
>  2 files changed, 5 insertions(+), 0 deletions(-)
>=20
> diff --git a/hw/arm_boot.c b/hw/arm_boot.c
> index 7447f5c..8e25873b 100644
> --- a/hw/arm_boot.c
> +++ b/hw/arm_boot.c
> @@ -320,6 +320,7 @@ void arm_load_kernel(CPUARMState *env, struct arm_b=
oot_info *info)

Beware that this signature has changed on qom-next branch, but I don't
see a conflict here.

Andreas

>      machine_opts =3D qemu_opts_find(qemu_find_opts("machine"), 0);
>      if (machine_opts) {
>          info->dtb_filename =3D qemu_opt_get(machine_opts, "dtb");
> +        is_linux =3D qemu_opt_get_bool(machine_opts, "linux", 0) ? 1 :=
 0;
>      } else {
>          info->dtb_filename =3D NULL;
>      }
> diff --git a/qemu-config.c b/qemu-config.c
> index be84a03..0ee781c 100644
> --- a/qemu-config.c
> +++ b/qemu-config.c
> @@ -582,6 +582,10 @@ static QemuOptsList qemu_machine_opts =3D {
>              .name =3D "dtb",
>              .type =3D QEMU_OPT_STRING,
>              .help =3D "Linux kernel device tree file",
> +        }, {
> +            .name =3D "linux",
> +            .type =3D QEMU_OPT_BOOL,
> +            .help =3D "Bootstrap Linux",
>          },
>          { /* End of list */ }
>      },


--=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