Re: [Qemu-devel] [PATCH 1/2] scripts/update-linux-headers.sh: adjust for Linux 4.21-rc1 (or 5.0-rc1)

[Aleksandar Markovic]

On Friday, January 4, 2019, Paolo Bonzini <address@hidden> wrote:

> There are three new indirect inclusions: vhost_types.h, which we'll
> shortly put to use as a portable header and thus is copied to
> standard-headers; and new per-subtarget versions of MIPS unistd.h
> and PowerPC unistd.h.
>
> Because vhost.h includes vhost_types.h, we also need a proxy include
> from linux/vhost.h to standard-headers.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  scripts/update-linux-headers.sh | 11 +++++++++++
>  1 file changed, 11 insertions(+)


For MIPS parts:

 Reviewed-by: Aleksandar Markovic <address@hidden>

>
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-
> headers.sh
> index 0a964fe240..c933489cbc 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -101,6 +101,13 @@ for arch in $ARCHLIST; do
>
>      if [ $arch = mips ]; then
>          cp "$tmpdir/include/asm/sgidefs.h" "$output/linux-headers/asm-
> mips/"
> +        cp "$tmpdir/include/asm/unistd_o32.h" "$output/linux-headers/asm-
> mips/"
> +        cp "$tmpdir/include/asm/unistd_n32.h" "$output/linux-headers/asm-
> mips/"
> +        cp "$tmpdir/include/asm/unistd_n64.h" "$output/linux-headers/asm-
> mips/"
> +    fi
> +    if [ $arch = powerpc ]; then
> +        cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-
> powerpc/"
> +        cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-
> powerpc/"
>      fi
>
>      rm -rf "$output/include/standard-headers/asm-$arch"
> @@ -162,6 +169,9 @@ EOF
>  cat <<EOF >$output/linux-headers/linux/virtio_ring.h
>  #include "standard-headers/linux/virtio_ring.h"
>  EOF
> +cat <<EOF >$output/linux-headers/linux/vhost_types.h
> +#include "standard-headers/linux/vhost_types.h"
> +EOF
>
>  rm -rf "$output/include/standard-headers/linux"
>  mkdir -p "$output/include/standard-headers/linux"
> @@ -171,6 +181,7 @@ for i in "$tmpdir"/include/linux/*virtio*.h \
>           "$tmpdir/include/linux/input-event-codes.h" \
>           "$tmpdir/include/linux/pci_regs.h" \
>           "$tmpdir/include/linux/ethtool.h" "$tmpdir/include/linux/kernel.h"
> \
> +         "$tmpdir/include/linux/vhost_types.h" \
>           "$tmpdir/include/linux/sysinfo.h"; do
>      cp_portable "$i" "$output/include/standard-headers/linux"
>  done
> --
> 2.20.1
>
>
>
>