Re: [Qemu-devel] [PATCH RFC] PowerPC: Added uapi directory into linux-header

[Peter Maydell]

On 14 December 2012 11:04, Bharat Bhushan <address@hidden> wrote:
> This is corrently done for powerpc.

This commit message is a bit cryptic.

> Signed-off-by: Bharat Bhushan <address@hidden>
> ---
>  configure                       |    1 +
>  scripts/update-linux-headers.sh |    5 +++++
>  2 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/configure b/configure
> index 780b19a..bdc2d5e 100755
> --- a/configure
> +++ b/configure
> @@ -3701,6 +3701,7 @@ if test "$linux" = "yes" ; then
>      # For non-KVM architectures we will not have asm headers
>      if [ -e "$source_path/linux-headers/asm-$linux_arch" ]; then
>        symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
> +      symlink "$source_path/linux-headers/uapi/asm-$linux_arch" 
> linux-headers/uapi/asm
>      fi

This creates a broken symlink if you run it on an arch that
doesn't have a uapi directory:
cam-vm-266:precise:qemu$ file linux-headers/uapi/asm
linux-headers/uapi/asm: broken symbolic link to
`/home/petmay01/linaro/qemu-from-laptop/qemu/linux-headers/uapi/asm-x86'

Shouldn't it go in its own "if [ -e
"$source_path/linux-headers/uapi/asm-$linux_arch" ]"
guard ?

>  fi
>
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 4c7b566..9f6bf25 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -48,6 +48,11 @@ for arch in $ARCHLIST; do
>
>      rm -rf "$output/linux-headers/asm-$arch"
>      mkdir -p "$output/linux-headers/asm-$arch"
> +    if [ $arch = powerpc ]; then
> +       rm -rf $output/linux-headers/uapi/asm-$arch/*
> +        cp "$linux/arch/$arch/include/uapi/asm/epapr_hcalls.h" 
> "$output/linux-headers/uapi/asm-$arch/"
> +    fi

(1) This doesn't seem to be doing the mkdir of
"$output/linux-headers/uapi/asm-$arch/" anywhere.

(2) The setup of the uapi/ subdirectory shouldn't be
inside an "if [ $arch = powerpc ]" guard, so it can
work on all archs with a uapi/. You want to rm-and-mkdir
the uapi/ directory if $linux/arch/$arch/include/uapi/
exists.

(3) it would be neater to put the "copy this ppc specific
header file" code at the bottom of the for loop next
to the existing "copy this x86 specific header file" code.

-- PMM