Received: from eggs.gnu.org ([2001:4830:134:3::10]:41173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMxY3-0005yu-Kd for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:39:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YMxXy-00081C-4m for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:39:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59302) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMxXx-000813-Ty for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:39:34 -0500 Date: Sun, 15 Feb 2015 12:39:25 +0100 From: "Michael S. Tsirkin" Message-ID: <1423999136-17320-16-git-send-email-mst@redhat.com> References: <1423999136-17320-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1423999136-17320-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/17] scripts: add arch specific standard-headers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , Peter Maydell , Alexander Graf , Stefan Hajnoczi , "Chen, Tiejun" Move virtio header copying logic to a function, use that to copy arch specific virtio headers. Signed-off-by: Michael S. Tsirkin --- scripts/update-linux-headers.sh | 56 ++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 9654553..1be4d83 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=$(expr "$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/]*\)>/"standard-headers\/sys\/\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 *) @@ -57,6 +87,8 @@ for arch in $ARCHLIST; do if [ $arch = powerpc ]; then cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/" fi + + cp_virtio "$tmpdir/include/asm" "$output/include/standard-headers/asm-$arch" done rm -rf "$output/linux-headers/linux" @@ -83,29 +115,7 @@ cat <$output/linux-headers/linux/virtio_ring.h #include "standard-headers/sys/virtio_ring.h" EOF -rm -rf "$output/include/standard-headers/sys" -mkdir -p "$output/include/standard-headers/sys" -for f in $tmpdir/include/linux/virtio*h; 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=$(expr "$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/]*\)>/"standard-headers\/sys\/\1"/' \ - -e 's/__bitwise__//' \ - -e 's/__attribute__((packed))/QEMU_PACKED/' \ - "$tmpdir/include/linux/$header" > \ - "$output/include/standard-headers/sys/$header"; -done +cp_virtio "$tmpdir/include/linux/" "$output/include/standard-headers/sys" cat <$output/include/standard-headers/sys/types.h #include -- MST