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 <pbonzini@redhat.com>
---
 scripts/update-linux-headers.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

On Fri,  4 Jan 2019 09:27:30 +0100
Paolo Bonzini <pbonzini@redhat.com> 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 <pbonzini@redhat.com>
> ---
>  scripts/update-linux-headers.sh | 11 +++++++++++
>  1 file changed, 11 insertions(+)

I still think we could squash this change (and the description :) with
the headers update, but I don't object to a separate change, either.

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

On 04/01/19 10:26, Cornelia Huck wrote:
> On Fri,  4 Jan 2019 09:27:30 +0100
> Paolo Bonzini <pbonzini@redhat.com> 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 <pbonzini@redhat.com>
>> ---
>>  scripts/update-linux-headers.sh | 11 +++++++++++
>>  1 file changed, 11 insertions(+)
> 
> I still think we could squash this change (and the description :) with
> the headers update, but I don't object to a separate change, either.

Me too, but I figured I'd rather not pull another tantrum like I did for
multiline comments...

Paolo

On Fri, 4 Jan 2019 at 11:02, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 04/01/19 10:26, Cornelia Huck wrote:
> > On Fri,  4 Jan 2019 09:27:30 +0100
> > Paolo Bonzini <pbonzini@redhat.com> 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 <pbonzini@redhat.com>
> >> ---
> >>  scripts/update-linux-headers.sh | 11 +++++++++++
> >>  1 file changed, 11 insertions(+)
> >
> > I still think we could squash this change (and the description :) with
> > the headers update, but I don't object to a separate change, either.
>
> Me too, but I figured I'd rather not pull another tantrum like I did for
> multiline comments...

I do find it more easily reviewable this way, so thanks for doing
the split. Admittedly this is partly because my mail client's UI is
not very good for long messages, so this biases me towards
preferring shorter patches rather than ones which are longer
but where only a subsection of them requires close review.

I notice that we now have 3 uses of
+cat <<EOF >$output/linux-headers/linux/foo.h
+#include "standard-headers/linux/foo.h"
+EOF

(for virtio_config.h, virtio_ring.h and vhost_types.h);
next time we add one we could probably switch to a for loop,
but it doesn't make enough benefit to justify respinning
this patch.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

On Friday, January 4, 2019, Paolo Bonzini <pbonzini@redhat.com> 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 <pbonzini@redhat.com>
> ---
>  scripts/update-linux-headers.sh | 11 +++++++++++
>  1 file changed, 11 insertions(+)


For MIPS parts:

 Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

>
> 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
>
>
>
>