Re: [PATCH v2 2/3] util/grub.d/20_linux_xen.in: Add arm64 support

[Andrei Borzenkov]

В Mon, 13 Jul 2015 16:53:59 +0800
address@hidden пишет:

> From: Fu Wei <address@hidden>
> 
> This patch adds the support of boot command on arm64 for XEN:
>     xen_hypervisor
>     xen_module
> 
> Signed-off-by: Fu Wei <address@hidden>
> ---
>  util/grub.d/20_linux_xen.in | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
> index f532fb9..b52c50d 100644
> --- a/util/grub.d/20_linux_xen.in
> +++ b/util/grub.d/20_linux_xen.in
> @@ -120,16 +120,16 @@ linux_entry ()
>          else
>              xen_rm_opts="no-real-mode edd=off"
>          fi
> -     multiboot       ${rel_xen_dirname}/${xen_basename} placeholder 
> ${xen_args} \${xen_rm_opts}
> +     ${multiboot_cmd}        ${rel_xen_dirname}/${xen_basename} placeholder 
> ${xen_args} \${xen_rm_opts}
>       echo    '$(echo "$lmessage" | grub_quote)'
> -     module  ${rel_dirname}/${basename} placeholder 
> root=${linux_root_device_thisversion} ro ${args}
> +     ${module_cmd}   ${rel_dirname}/${basename} placeholder 
> root=${linux_root_device_thisversion} ro ${args}
>  EOF
>    if test -n "${initrd}" ; then
>      # TRANSLATORS: ramdisk isn't identifier. Should be translated.
>      message="$(gettext_printf "Loading initial ramdisk ...")"
>      sed "s/^/$submenu_indentation/" << EOF
>       echo    '$(echo "$message" | grub_quote)'
> -     module  --nounzip   ${rel_dirname}/${initrd}
> +     ${module_cmd}   --nounzip   ${rel_dirname}/${initrd}
>  EOF
>    fi
>    sed "s/^/$submenu_indentation/" << EOF
> @@ -185,6 +185,14 @@ case "$machine" in
>      *) GENKERNEL_ARCH="$machine" ;;
>  esac
>  
> +if [ "x$machine" != xaarch64 ]; then
> +     multiboot_cmd="multiboot"
> +     module_cmd="module"
> +else
> +     multiboot_cmd="xen_hypervisor"
> +     module_cmd="xen_module"
> +fi
> +

Strictly speaking, this is boot-time decision. As mentioned by
Vladimir, better would be to provide alias xen_hypervisor and
xen_module in multiboot for platforms supporting Xen (is MIPS really
supported?) and use it consistently.

>  # Extra indentation to add to menu entries in a submenu. We're not in a 
> submenu
>  # yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
>  submenu_indentation=""