[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 1/3] update-linux-headers.sh: unistd.h, kvm c
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v5 1/3] update-linux-headers.sh: unistd.h, kvm consistency |
Date: |
Sat, 12 May 2018 21:43:53 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 |
On 05/11/2018 06:32 PM, Michael S. Tsirkin 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.
>
> Cc: Dr. David Alan Gilbert <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> scripts/update-linux-headers.sh | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index a017b53..7af5bb1 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -84,11 +84,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
> @@ -99,9 +94,14 @@ for arch in $ARCHLIST; do
>
> rm -rf "$output/linux-headers/asm-$arch"
> mkdir -p "$output/linux-headers/asm-$arch"
> - for header in kvm.h unistd.h; do
> + for header in kvm.h unistd.h bitsperlong.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
> +
> rm -rf "$output/include/standard-headers/asm-$arch"
> mkdir -p "$output/include/standard-headers/asm-$arch"
> if [ $arch = s390 ]; then
> @@ -132,6 +132,12 @@ for header in kvm.h vfio.h vfio_ccw.h vhost.h \
> cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
> done
>
> +rm -rf "$output/linux-headers/asm-generic"
> +mkdir -p "$output/linux-headers/asm-generic"
> +for header in unistd.h bitsperlong.h; do
> + cp "$tmpdir/include/asm-generic/$header"
> "$output/linux-headers/asm-generic"
> +done
> +
> if [ -L "$linux/source" ]; then
> cp "$linux/source/COPYING" "$output/linux-headers"
> else
>
- [Qemu-devel] [PATCH v5 0/3] linux-headers: arch fixups, Michael S. Tsirkin, 2018/05/11
- [Qemu-devel] [PATCH v5 1/3] update-linux-headers.sh: unistd.h, kvm consistency, Michael S. Tsirkin, 2018/05/11
- Re: [Qemu-devel] [PATCH v5 1/3] update-linux-headers.sh: unistd.h, kvm consistency,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v5 3/3] linux-headers: add kvm header for mips, Michael S. Tsirkin, 2018/05/11
- [Qemu-devel] [PATCH v5 2/3] linux-headers: add unistd.h on all arches, Michael S. Tsirkin, 2018/05/11
- Re: [Qemu-devel] [PATCH v5 0/3] linux-headers: arch fixups, Peter Maydell, 2018/05/14