diff options
| author | Roman Kagan <rkagan@virtuozzo.com> | 2017-07-13 23:15:22 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-09-19 16:20:49 +0200 |
| commit | 40bf8e9aede0f9105a9e1e4aaf17b20aaa55f9a0 (patch) | |
| tree | 86ac5824e945dc60fcce8cb592bc042b2dc26ac1 | |
| parent | 5e95381260e668a3a02aff5485401788b41b3050 (diff) | |
| download | qemu-40bf8e9aede0f9105a9e1e4aaf17b20aaa55f9a0.zip qemu-40bf8e9aede0f9105a9e1e4aaf17b20aaa55f9a0.tar.gz qemu-40bf8e9aede0f9105a9e1e4aaf17b20aaa55f9a0.tar.bz2 | |
update-linux-headers: prepare for hyperv.h removal
All definitions related to Hyper-V emulation are now taken from the QEMU
own header, so the one imported from the kernel is no longer needed.
Unfortunately it's included by kvm_para.h.
So, until this is fixed in the kernel, teach the header harvesting
script to substitute kernel's hyperv.h with a dummy.
Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
Message-Id: <20170713201522.13765-3-rkagan@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | scripts/update-linux-headers.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 2f906c4..ad80fe3 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -104,7 +104,9 @@ for arch in $ARCHLIST; do cp "$tmpdir/include/asm/unistd-common.h" "$output/linux-headers/asm-arm/" fi if [ $arch = x86 ]; then - cp_portable "$tmpdir/include/asm/hyperv.h" "$output/include/standard-headers/asm-x86/" + 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/" |