Rework the update script slightly, add the unistd.h header and its
dependencies on all architectures.

This also removes the IA64 and MIPS from a KVM blacklist:
Linux dropped IA64, and there was never a reason to
exclude MIPS from kvm specifically - it was
excluded due to dependency of its unistd.h on sgidefs.h,
which we also import.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 scripts/update-linux-headers.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index d18e2f1..2a4dac8a 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -80,11 +80,6 @@ for arch in $ARCHLIST; do
         continue
     fi
 
-    # Blacklist architectures which have KVM headers but are actually dead
-    if [ "$arch" = "ia64" -o "$arch" = "mips" ]; then
-        continue
-    fi
-
     if [ "$arch" = x86 ]; then
         arch_var=SRCARCH
     else
@@ -95,9 +90,18 @@ for arch in $ARCHLIST; do
 
     rm -rf "$output/linux-headers/asm-$arch"
     mkdir -p "$output/linux-headers/asm-$arch"
-    for header in kvm.h kvm_para.h unistd.h; do
+    for header in unistd.h bitsperlong.h; do
+        cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
+    done
+
+    for header in kvm.h kvm_para.h; do
         cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
     done
+
+    if [ $arch = mips ]; then
+        cp "$tmpdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips/"
+    fi
+
     if [ $arch = powerpc ]; then
         cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/"
     fi
@@ -120,6 +124,10 @@ EOF
         cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
         cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
     fi
+    if [ $arch = s390 ]; then
+        cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-arm/"
+        cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-arm/"
+    fi
 done
 
 rm -rf "$output/linux-headers/linux"
@@ -130,7 +138,7 @@ for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \
 done
 rm -rf "$output/linux-headers/asm-generic"
 mkdir -p "$output/linux-headers/asm-generic"
-for header in kvm_para.h; do
+for header in kvm_para.h bitsperlong.h unistd.h; do
     cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
 done
 if [ -L "$linux/source" ]; then
-- 
MST

* Michael S. Tsirkin (mst@redhat.com) wrote:
> Rework the update script slightly, add the unistd.h header and its
> dependencies on all architectures.
> 
> This also removes the IA64 and MIPS from a KVM blacklist:
> Linux dropped IA64, and there was never a reason to
> exclude MIPS from kvm specifically - it was
> excluded due to dependency of its unistd.h on sgidefs.h,
> which we also import.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  scripts/update-linux-headers.sh | 22 +++++++++++++++-------
>  1 file changed, 15 insertions(+), 7 deletions(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index d18e2f1..2a4dac8a 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -80,11 +80,6 @@ for arch in $ARCHLIST; do
>          continue
>      fi
>  
> -    # Blacklist architectures which have KVM headers but are actually dead
> -    if [ "$arch" = "ia64" -o "$arch" = "mips" ]; then
> -        continue
> -    fi
> -
>      if [ "$arch" = x86 ]; then
>          arch_var=SRCARCH
>      else
> @@ -95,9 +90,18 @@ for arch in $ARCHLIST; do
>  
>      rm -rf "$output/linux-headers/asm-$arch"
>      mkdir -p "$output/linux-headers/asm-$arch"
> -    for header in kvm.h kvm_para.h unistd.h; do
> +    for header in unistd.h bitsperlong.h; do
> +        cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
> +    done
> +
> +    for header in kvm.h kvm_para.h; do
>          cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
>      done
> +
> +    if [ $arch = mips ]; then
> +        cp "$tmpdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips/"
> +    fi
> +
>      if [ $arch = powerpc ]; then
>          cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/"
>      fi
> @@ -120,6 +124,10 @@ EOF
>          cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
>      fi
> +    if [ $arch = s390 ]; then
> +        cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-arm/"
> +        cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-arm/"

That doesn't look right - I'm guessing that should be copying into
asm-s390 ?

Dave

> +    fi
>  done
>  
>  rm -rf "$output/linux-headers/linux"
> @@ -130,7 +138,7 @@ for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \
>  done
>  rm -rf "$output/linux-headers/asm-generic"
>  mkdir -p "$output/linux-headers/asm-generic"
> -for header in kvm_para.h; do
> +for header in kvm_para.h bitsperlong.h unistd.h; do
>      cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
>  done
>  if [ -L "$linux/source" ]; then
> -- 
> MST
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

On Fri, 23 Mar 2018 17:38:24 +0000
"Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:

> * Michael S. Tsirkin (mst@redhat.com) wrote:

> > @@ -120,6 +124,10 @@ EOF
> >          cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
> >          cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
> >      fi
> > +    if [ $arch = s390 ]; then
> > +        cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-arm/"
> > +        cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-arm/"  
> 
> That doesn't look right - I'm guessing that should be copying into
> asm-s390 ?

I think we rather need "$arch = arm" or so here (s390 only has
unistd.h, which is already handled).