david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update-linux-headers.sh: drop kvm_para.h hacks

Browse Source 
It turns out (as will be clear from follow-up patches)
we do not really need any kvm para macros host side
for now, except on x86, and there we need it
unconditionally whether we run on kvm or we don't.

Import the x86 asm/kvm_para.h into standard-headers,
follow-up patches remove a bunch of code using this.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2018-04-17 21:42:21 +03:00
parent ffcbbe722f
commit ec7b10800c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/update-linux-headers.sh
View File

@ -43,6 +43,7 @@ cp_portable() {
-e 'limits' \ -e 'limits' \
-e 'linux/kernel' \ -e 'linux/kernel' \
-e 'linux/sysinfo' \ -e 'linux/sysinfo' \
-e 'asm-generic/kvm_para' \
> /dev/null > /dev/null
then then
echo "Unexpected #include in input file $f". echo "Unexpected #include in input file $f".
@ -98,13 +99,9 @@ for arch in $ARCHLIST; do
rm -rf "$output/linux-headers/asm-$arch" rm -rf "$output/linux-headers/asm-$arch"
mkdir -p "$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 kvm.h unistd.h; do
cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
done done
if [ $arch = powerpc ]; then
cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/"
fi
rm -rf "$output/include/standard-headers/asm-$arch" rm -rf "$output/include/standard-headers/asm-$arch"
mkdir -p "$output/include/standard-headers/asm-$arch" mkdir -p "$output/include/standard-headers/asm-$arch"
if [ $arch = s390 ]; then if [ $arch = s390 ]; then
@ -121,20 +118,17 @@ for arch in $ARCHLIST; do
cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/" 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_x32.h" "$output/linux-headers/asm-x86/"
cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/" cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"
fi fi
done done
rm -rf "$output/linux-headers/linux" rm -rf "$output/linux-headers/linux"
mkdir -p "$output/linux-headers/linux" mkdir -p "$output/linux-headers/linux"
for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \ for header in kvm.h vfio.h vfio_ccw.h vhost.h \
psci.h psp-sev.h userfaultfd.h; do psci.h psp-sev.h userfaultfd.h; do
cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
done done
rm -rf "$output/linux-headers/asm-generic"
mkdir -p "$output/linux-headers/asm-generic"
for header in kvm_para.h; do
cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
done
if [ -L "$linux/source" ]; then if [ -L "$linux/source" ]; then
cp "$linux/source/COPYING" "$output/linux-headers" cp "$linux/source/COPYING" "$output/linux-headers"
else else