scripts/update-linux-headers.sh: pull virtio hdrs
It doesn't make sense to copy values manually: the only issue with getting headers from linux seems to be dealing with linux/types, we can easily fix that automatically while importing. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
This commit is contained in:
parent
afaa2e4bc4
commit
1ff0b555d3
|
@ -28,6 +28,36 @@ if [ -z "$output" ]; then
|
||||||
output="$PWD"
|
output="$PWD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cp_virtio() {
|
||||||
|
from=$1
|
||||||
|
to=$2
|
||||||
|
virtio=$(find "$from" -name '*virtio*h')
|
||||||
|
if [ "$virtio" ]; then
|
||||||
|
rm -rf "$to"
|
||||||
|
mkdir -p "$to"
|
||||||
|
for f in $virtio; do
|
||||||
|
if
|
||||||
|
grep '#include' "$f" | grep -v -e 'linux/virtio' \
|
||||||
|
-e 'linux/types' \
|
||||||
|
-e 'linux/if_ether' \
|
||||||
|
> /dev/null
|
||||||
|
then
|
||||||
|
echo "Unexpected #include in input file $f".
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
header=$(basename "$f");
|
||||||
|
sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \
|
||||||
|
-e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \
|
||||||
|
-e 's/__be\([0-9][0-9]*\)/uint\1_t/g' \
|
||||||
|
-e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
|
||||||
|
-e 's/__bitwise__//' \
|
||||||
|
-e 's/__attribute__((packed))/QEMU_PACKED/' \
|
||||||
|
"$f" > "$to/$header";
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# This will pick up non-directories too (eg "Kconfig") but we will
|
# This will pick up non-directories too (eg "Kconfig") but we will
|
||||||
# ignore them in the next loop.
|
# ignore them in the next loop.
|
||||||
ARCHLIST=$(cd "$linux/arch" && echo *)
|
ARCHLIST=$(cd "$linux/arch" && echo *)
|
||||||
|
@ -76,4 +106,15 @@ else
|
||||||
cp "$linux/COPYING" "$output/linux-headers"
|
cp "$linux/COPYING" "$output/linux-headers"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
cp_virtio "$tmpdir/include/linux/" "$output/include/standard-headers/linux"
|
||||||
|
|
||||||
|
cat <<EOF >$output/include/standard-headers/linux/types.h
|
||||||
|
#include <stdint.h>
|
||||||
|
#include "qemu/compiler.h"
|
||||||
|
EOF
|
||||||
|
cat <<EOF >$output/include/standard-headers/linux/if_ether.h
|
||||||
|
#define ETH_ALEN 6
|
||||||
|
EOF
|
||||||
|
|
||||||
rm -rf "$tmpdir"
|
rm -rf "$tmpdir"
|
||||||
|
|
Loading…
Reference in a new issue