[Qemu-devel] [PATCH] update-linux-headers: drop hyperv.h

[Qemu-devel] [PATCH] update-linux-headers: drop hyperv.h

[Roman Kagan]

As of mainline linux commit 5a485803221777013944cbd1a7cd5c62efba3ffa
"x86/hyper-v: move hyperv.h out of uapi" by Vitaly Kuznetsov, no linux
uapi header includes it, so we no longer need to create a stub for it.

Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
---
 scripts/update-linux-headers.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 5b1d8dcdf4..b65c03f0ae 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -118,9 +118,6 @@ for arch in $ARCHLIST; do
         cp "$tmpdir/include/asm/unistd-common.h" "$output/linux-headers/asm-arm/"
     fi
     if [ $arch = x86 ]; then
-        cat <<-EOF >"$output/include/standard-headers/asm-x86/hyperv.h"
-        /* this is a temporary placeholder until kvm_para.h stops including it */
-EOF
         cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
         cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
         cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
@@ -144,9 +141,6 @@ else
     cp "$linux/COPYING" "$output/linux-headers"
 fi
 
-cat <<EOF >$output/linux-headers/asm-x86/hyperv.h
-#include "standard-headers/asm-x86/hyperv.h"
-EOF
 cat <<EOF >$output/linux-headers/linux/virtio_config.h
 #include "standard-headers/linux/virtio_config.h"
 EOF
-- 
2.14.3

Re: [Qemu-devel] [PATCH] update-linux-headers: drop hyperv.h

[Paolo Bonzini]

On 13/04/2018 16:33, Roman Kagan wrote:
> As of mainline linux commit 5a485803221777013944cbd1a7cd5c62efba3ffa
> "x86/hyper-v: move hyperv.h out of uapi" by Vitaly Kuznetsov, no linux
> uapi header includes it, so we no longer need to create a stub for it.
> 
> Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
> Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
> ---
>  scripts/update-linux-headers.sh | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 5b1d8dcdf4..b65c03f0ae 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -118,9 +118,6 @@ for arch in $ARCHLIST; do
>          cp "$tmpdir/include/asm/unistd-common.h" "$output/linux-headers/asm-arm/"
>      fi
>      if [ $arch = x86 ]; then
> -        cat <<-EOF >"$output/include/standard-headers/asm-x86/hyperv.h"
> -        /* this is a temporary placeholder until kvm_para.h stops including it */
> -EOF
>          cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
>          cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
> @@ -144,9 +141,6 @@ else
>      cp "$linux/COPYING" "$output/linux-headers"
>  fi
>  
> -cat <<EOF >$output/linux-headers/asm-x86/hyperv.h
> -#include "standard-headers/asm-x86/hyperv.h"
> -EOF
>  cat <<EOF >$output/linux-headers/linux/virtio_config.h
>  #include "standard-headers/linux/virtio_config.h"
>  EOF
> 

Queued, thanks.

Paolo