Received: from eggs.gnu.org ([2001:4830:134:3::10]:41108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMxXt-0005fy-Pl for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:39:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YMxXo-0007yp-7k for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:39:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38488) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMxXo-0007ya-1C for qemu-devel@nongnu.org; Sun, 15 Feb 2015 06:39:24 -0500 Date: Sun, 15 Feb 2015 12:39:15 +0100 From: "Michael S. Tsirkin" Message-ID: <1423999136-17320-13-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 12/17] update-linux-headers: use 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" Drop the linux-specific virtio headers, use the copy from standard-headers instead. Signed-off-by: Michael S. Tsirkin --- scripts/update-linux-headers.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 738e590..9654553 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -61,7 +61,7 @@ done rm -rf "$output/linux-headers/linux" mkdir -p "$output/linux-headers/linux" -for header in kvm.h kvm_para.h vfio.h vhost.h virtio_config.h virtio_ring.h \ +for header in kvm.h kvm_para.h vfio.h vhost.h \ psci.h; do cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" done @@ -76,6 +76,12 @@ else cp "$linux/COPYING" "$output/linux-headers" fi +cat <$output/linux-headers/linux/virtio_config.h +#include "standard-headers/sys/virtio_config.h" +EOF +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" -- MST