[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 42/96] update-linux-headers: use standard-headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 42/96] update-linux-headers: use standard-headers |
Date: |
Wed, 18 Feb 2015 22:48:16 +0100 |
Drop the linux-specific virtio headers, use the copy from
standard-headers instead.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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 8926dec..5ab3914 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -91,7 +91,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
@@ -106,6 +106,12 @@ else
cp "$linux/COPYING" "$output/linux-headers"
fi
+cat <<EOF >$output/linux-headers/linux/virtio_config.h
+#include "standard-headers/linux/virtio_config.h"
+EOF
+cat <<EOF >$output/linux-headers/linux/virtio_ring.h
+#include "standard-headers/linux/virtio_ring.h"
+EOF
cp_virtio "$tmpdir/include/linux/" "$output/include/standard-headers/linux"
--
MST
- [Qemu-devel] [PULL 32/96] include: import virtio headers from linux 4.0, (continued)
- [Qemu-devel] [PULL 32/96] include: import virtio headers from linux 4.0, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 35/96] virtio-balloon: use standard headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 33/96] virtio: use standard virtio_ring.h, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 34/96] virtio: use standard-headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 36/96] virtio-9p: use standard headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 37/96] virtio-blk: switch to standard-headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 38/96] virtio-net,tap: use standard-headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 39/96] virtio-rng: use standard-headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 40/96] virtio-scsi: use standard-headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 41/96] virtio-serial: switch to standard-headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 42/96] update-linux-headers: use standard-headers,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 43/96] linux-headers: use standard-headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 44/96] virtio-pci: use standard headers, Michael S. Tsirkin, 2015/02/18
- Re: [Qemu-devel] [PULL 00/96] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 45/96] scripts: add arch specific standard-headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 46/96] standard-headers: add s390 virtio headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 47/96] s390: use standard headers, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 48/96] virtio: cull virtio_bus_set_vdev_features, Michael S. Tsirkin, 2015/02/18