diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-02-16 22:35:25 +0100 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2015-02-26 12:42:20 +0100 |
commit | 1ff0b555d3c6ba291adf0c4c76e222acfeb52f1d (patch) | |
tree | 64ec4047dce6358ff0692f3b54fa63e03abbb699 | |
parent | afaa2e4bc4e17360307cb86fbb1d5d350ae22961 (diff) |
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>
-rwxr-xr-x | scripts/update-linux-headers.sh | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index c8e026d37e..8926dec57f 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -28,6 +28,36 @@ if [ -z "$output" ]; then output="$PWD" 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 # ignore them in the next loop. ARCHLIST=$(cd "$linux/arch" && echo *) @@ -76,4 +106,15 @@ else cp "$linux/COPYING" "$output/linux-headers" 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" |