Re: [Qemu-devel] [RFC PATCH 5/7] vl.c: added -kerndtb option

[Andreas Färber]

Am 23.01.2012 08:20, schrieb Peter A. G. Crosthwaite:
> Added linux specific kernel dtb option. This option can be specified to inject
> an argument device tree blob (dtb) into linux.
> 
> Signed-off-by: Peter A. G. Crosthwaite <address@hidden>
> ---
>  qemu-options.hx |    3 +++
>  vl.c            |    4 ++++
>  2 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 6295cde..43cddff 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -1931,6 +1931,9 @@ ETEXI
>  
>  DEF("kernel", HAS_ARG, QEMU_OPTION_kernel, \
>      "-kernel bzImage use 'bzImage' as kernel image\n", QEMU_ARCH_ALL)
> +DEF("kern-dtb", HAS_ARG, QEMU_OPTION_kerndtb, \
> +    "-kern-dtb dtb device tree blob passed to kernel boot\n", QEMU_ARCH_ALL)

We should probably call it -kernel-dtb. If there's some strncmp() from
-kernel interfering, we should fix that instead.

I don't see this variable being used anywhere in this series though.
Would it have been in the missing zynq machine of 7/7?

Andreas

> +
>  STEXI
>  @item -kernel @var{bzImage}
>  @findex -kernel
> diff --git a/vl.c b/vl.c
> index d5868b1..75246f8 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -233,6 +233,7 @@ int boot_menu;
>  uint8_t *boot_splash_filedata;
>  int boot_splash_filedata_size;
>  uint8_t qemu_extra_params_fw[2];
> +const char *qemu_kerndtb = NULL;
>  
>  typedef struct FWBootEntry FWBootEntry;
>  
> @@ -2437,6 +2438,9 @@ int main(int argc, char **argv, char **envp)
>              case QEMU_OPTION_kernel:
>                  kernel_filename = optarg;
>                  break;
> +            case QEMU_OPTION_kerndtb:
> +                qemu_kerndtb = optarg;
> +                break;
>              case QEMU_OPTION_append:
>                  kernel_cmdline = optarg;
>                  break;

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg