From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40688)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YMxXF-0004YI-9H
	for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:38:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YMxX9-0007j5-Po
	for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:38:49 -0500
Received: from mx1.redhat.com ([209.132.183.28]:38305)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YMxX9-0007in-H7
	for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:38:43 -0500
Date: Sun, 15 Feb 2015 12:38:34 +0100
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <1423999136-17320-2-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 01/17] scripts/update-linux-headers.sh: pull
	virtio hdrs
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, Alexander Graf <agraf@suse.de>, Stefan Hajnoczi <stefanha@redhat.com>, "Chen,
	Tiejun" <tiejun.chen@intel.com>

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>
---
 scripts/update-linux-headers.sh | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index c8e026d..738e590 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -76,4 +76,37 @@ else
     cp "$linux/COPYING" "$output/linux-headers"
 fi
 
+
+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/<linux\/\([^>]*\)>/"standard-headers\/sys\/\1"/' \
+        -e 's/__bitwise__//' \
+        -e 's/__attribute__((packed))/QEMU_PACKED/' \
+        "$tmpdir/include/linux/$header" > \
+        "$output/include/standard-headers/sys/$header";
+done
+
+cat <<EOF >$output/include/standard-headers/sys/types.h
+#include <inttypes.h>
+#include "qemu/compiler.h"
+EOF
+cat <<EOF >$output/include/standard-headers/sys/if_ether.h
+#define ETH_ALEN    6
+EOF
+
 rm -rf "$tmpdir"
-- 
MST