[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/25] scripts/update-linux-headers.sh: adjust for Li
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 03/25] scripts/update-linux-headers.sh: adjust for Linux 4.21-rc1 (or 5.0-rc1) |
Date: |
Mon, 4 Feb 2019 09:43:24 -0500 |
From: Paolo Bonzini <address@hidden>
There are three new indirect inclusions: vhost_types.h, which we'll
shortly put to use as a portable header and thus is copied to
standard-headers; and new per-subtarget versions of MIPS unistd.h
and PowerPC unistd.h.
Because vhost.h includes vhost_types.h, we also need a proxy include
from linux/vhost.h to standard-headers.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
scripts/update-linux-headers.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 0a964fe240..c933489cbc 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -101,6 +101,13 @@ for arch in $ARCHLIST; do
if [ $arch = mips ]; then
cp "$tmpdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips/"
+ cp "$tmpdir/include/asm/unistd_o32.h" "$output/linux-headers/asm-mips/"
+ cp "$tmpdir/include/asm/unistd_n32.h" "$output/linux-headers/asm-mips/"
+ cp "$tmpdir/include/asm/unistd_n64.h" "$output/linux-headers/asm-mips/"
+ fi
+ if [ $arch = powerpc ]; then
+ cp "$tmpdir/include/asm/unistd_32.h"
"$output/linux-headers/asm-powerpc/"
+ cp "$tmpdir/include/asm/unistd_64.h"
"$output/linux-headers/asm-powerpc/"
fi
rm -rf "$output/include/standard-headers/asm-$arch"
@@ -162,6 +169,9 @@ EOF
cat <<EOF >$output/linux-headers/linux/virtio_ring.h
#include "standard-headers/linux/virtio_ring.h"
EOF
+cat <<EOF >$output/linux-headers/linux/vhost_types.h
+#include "standard-headers/linux/vhost_types.h"
+EOF
rm -rf "$output/include/standard-headers/linux"
mkdir -p "$output/include/standard-headers/linux"
@@ -171,6 +181,7 @@ for i in "$tmpdir"/include/linux/*virtio*.h \
"$tmpdir/include/linux/input-event-codes.h" \
"$tmpdir/include/linux/pci_regs.h" \
"$tmpdir/include/linux/ethtool.h" "$tmpdir/include/linux/kernel.h" \
+ "$tmpdir/include/linux/vhost_types.h" \
"$tmpdir/include/linux/sysinfo.h"; do
cp_portable "$i" "$output/include/standard-headers/linux"
done
--
MST
- Re: [Qemu-devel] [PULL 15/25] contrib: compile vhost-user-blk tool by default, (continued)
[Qemu-devel] [PULL 13/25] pci/msi: export msi_is_masked(), Michael S. Tsirkin, 2019/02/04
[Qemu-devel] [PULL 02/25] contrib/libvhost-user: switch to uint64_t, Michael S. Tsirkin, 2019/02/04
[Qemu-devel] [PULL 09/25] vhost-net: revamp configure logic, Michael S. Tsirkin, 2019/02/04
[Qemu-devel] [PULL 12/25] intel_iommu: reset intr_enabled when system reset, Michael S. Tsirkin, 2019/02/04
[Qemu-devel] [PULL 01/25] virtio: add checks for the size of the indirect table, Michael S. Tsirkin, 2019/02/04
[Qemu-devel] [PULL 10/25] hw: virtio-pci: drop DO_UPCAST, Michael S. Tsirkin, 2019/02/04
[Qemu-devel] [PULL 03/25] scripts/update-linux-headers.sh: adjust for Linux 4.21-rc1 (or 5.0-rc1),
Michael S. Tsirkin <=
[Qemu-devel] [PULL 05/25] vhost-net: move stubs to a separate file, Michael S. Tsirkin, 2019/02/04
[Qemu-devel] [PULL 04/25] include: update Linux headers to 4.21-rc1/5.0-rc1, Michael S. Tsirkin, 2019/02/04
Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features, Peter Maydell, 2019/02/04
- Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features, Michael S. Tsirkin, 2019/02/04
- Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features, Michael S. Tsirkin, 2019/02/04
- Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features, Michael S. Tsirkin, 2019/02/04
- Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features, Peter Maydell, 2019/02/05
- Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features, Michael S. Tsirkin, 2019/02/05
- Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features, Peter Maydell, 2019/02/05
- Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features, Peter Xu, 2019/02/12