 ed627b2ad3
			
		
	
	
		ed627b2ad3
		
	
	
	
	
		
			
			SRAT tables for DIMM devices new virtio net flags for speed/duplex post-copy migration support in vhost cleanups in pci Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJasR1rAAoJECgfDbjSjVRpOocH/R9A3g/TkpGjmLzJBrrX1NGO I/iq0ttHjqg4OBIChA4BHHjXwYUMs7XQn26B3efrk1otLAJhuqntZIIo3uU0WraA 5J+4DT46ogs5rZWNzDCZ0zAkSaATDA6h9Nfh7TvPc9Q2WpcIT0cTa/jOtrxRc9Vq 32hbUKtJSpNxRjwbZvk6YV21HtWo3Tktdaj9IeTQTN0/gfMyOMdgxta3+bymicbJ FuF9ybHcpXvrEctHhXHIL4/YVGEH/4shagZ4JVzv1dVdLeHLZtPomdf7+oc0+07m Qs+yV0HeRS5Zxt7w5blGLC4zDXczT/bUx8oln0Tz5MV7RR/+C2HwMOHC69gfpSc= =vomK -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio,vhost,pci,pc: features, cleanups SRAT tables for DIMM devices new virtio net flags for speed/duplex post-copy migration support in vhost cleanups in pci Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Tue 20 Mar 2018 14:40:43 GMT # gpg: using RSA key 281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: (51 commits) postcopy shared docs libvhost-user: Claim support for postcopy postcopy: Allow shared memory vhost: Huge page align and merge vhost+postcopy: Wire up POSTCOPY_END notify vhost-user: Add VHOST_USER_POSTCOPY_END message libvhost-user: mprotect & madvises for postcopy vhost+postcopy: Call wakeups vhost+postcopy: Add vhost waker postcopy: postcopy_notify_shared_wake postcopy: helper for waking shared vhost+postcopy: Resolve client address postcopy-ram: add a stub for postcopy_request_shared_page vhost+postcopy: Helper to send requests to source for shared pages vhost+postcopy: Stash RAMBlock and offset vhost+postcopy: Send address back to qemu libvhost-user+postcopy: Register new regions with the ufd migration/ram: ramblock_recv_bitmap_test_byte_offset postcopy+vhost-user: Split set_mem_table for postcopy vhost+postcopy: Transmit 'listen' to slave ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # scripts/update-linux-headers.sh
		
			
				
	
	
		
			207 lines
		
	
	
		
			7.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			207 lines
		
	
	
		
			7.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/bin/sh -e
 | |
| #
 | |
| # Update Linux kernel headers QEMU requires from a specified kernel tree.
 | |
| #
 | |
| # Copyright (C) 2011 Siemens AG
 | |
| #
 | |
| # Authors:
 | |
| #  Jan Kiszka        <jan.kiszka@siemens.com>
 | |
| #
 | |
| # This work is licensed under the terms of the GNU GPL version 2.
 | |
| # See the COPYING file in the top-level directory.
 | |
| 
 | |
| tmpdir=$(mktemp -d)
 | |
| linux="$1"
 | |
| output="$2"
 | |
| 
 | |
| if [ -z "$linux" ] || ! [ -d "$linux" ]; then
 | |
|     cat << EOF
 | |
| usage: update-kernel-headers.sh LINUX_PATH [OUTPUT_PATH]
 | |
| 
 | |
| LINUX_PATH      Linux kernel directory to obtain the headers from
 | |
| OUTPUT_PATH     output directory, usually the qemu source tree (default: $PWD)
 | |
| EOF
 | |
|     exit 1
 | |
| fi
 | |
| 
 | |
| if [ -z "$output" ]; then
 | |
|     output="$PWD"
 | |
| fi
 | |
| 
 | |
| cp_portable() {
 | |
|     f=$1
 | |
|     to=$2
 | |
|     if
 | |
|         grep '#include' "$f" | grep -v -e 'linux/virtio' \
 | |
|                                      -e 'linux/types' \
 | |
|                                      -e 'stdint' \
 | |
|                                      -e 'linux/if_ether' \
 | |
|                                      -e 'input-event-codes' \
 | |
|                                      -e 'sys/' \
 | |
|                                      -e 'pvrdma_verbs' \
 | |
|                                      -e 'drm.h' \
 | |
|                                      -e 'limits' \
 | |
|                                      -e 'linux/kernel' \
 | |
|                                      -e 'linux/sysinfo' \
 | |
|                                      > /dev/null
 | |
|     then
 | |
|         echo "Unexpected #include in input file $f".
 | |
|         exit 2
 | |
|     fi
 | |
| 
 | |
|     header=$(basename "$f");
 | |
|     sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \
 | |
|         -e 's/u\([0-9][0-9]*\)/uint\1_t/g' \
 | |
|         -e 's/__s\([0-9][0-9]*\)/int\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/"\(input-event-codes\.h\)"/"standard-headers\/linux\/\1"/' \
 | |
|         -e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
 | |
|         -e 's/__bitwise//' \
 | |
|         -e 's/__attribute__((packed))/QEMU_PACKED/' \
 | |
|         -e 's/__inline__/inline/' \
 | |
|         -e 's/__BITS_PER_LONG/HOST_LONG_BITS/' \
 | |
|         -e '/\"drm.h\"/d' \
 | |
|         -e '/sys\/ioctl.h/d' \
 | |
|         -e 's/SW_MAX/SW_MAX_/' \
 | |
|         -e 's/atomic_t/int/' \
 | |
|         -e 's/__kernel_long_t/long/' \
 | |
|         -e 's/__kernel_ulong_t/unsigned long/' \
 | |
|         -e 's/struct ethhdr/struct eth_header/' \
 | |
|         -e '/\#define _LINUX_ETHTOOL_H/a \\n\#include "net/eth.h"' \
 | |
|         "$f" > "$to/$header";
 | |
| }
 | |
| 
 | |
| # This will pick up non-directories too (eg "Kconfig") but we will
 | |
| # ignore them in the next loop.
 | |
| ARCHLIST=$(cd "$linux/arch" && echo *)
 | |
| 
 | |
| for arch in $ARCHLIST; do
 | |
|     # Discard anything which isn't a KVM-supporting architecture
 | |
|     if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ] &&
 | |
|         ! [ -e "$linux/arch/$arch/include/uapi/asm/kvm.h" ] ; then
 | |
|         continue
 | |
|     fi
 | |
| 
 | |
|     # Blacklist architectures which have KVM headers but are actually dead
 | |
|     if [ "$arch" = "ia64" -o "$arch" = "mips" ]; then
 | |
|         continue
 | |
|     fi
 | |
| 
 | |
|     if [ "$arch" = x86 ]; then
 | |
|         arch_var=SRCARCH
 | |
|     else
 | |
|         arch_var=ARCH
 | |
|     fi
 | |
| 
 | |
|     make -C "$linux" INSTALL_HDR_PATH="$tmpdir" $arch_var=$arch headers_install
 | |
| 
 | |
|     rm -rf "$output/linux-headers/asm-$arch"
 | |
|     mkdir -p "$output/linux-headers/asm-$arch"
 | |
|     for header in kvm.h kvm_para.h unistd.h; do
 | |
|         cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
 | |
|     done
 | |
|     if [ $arch = powerpc ]; then
 | |
|         cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/"
 | |
|     fi
 | |
| 
 | |
|     rm -rf "$output/include/standard-headers/asm-$arch"
 | |
|     mkdir -p "$output/include/standard-headers/asm-$arch"
 | |
|     if [ $arch = s390 ]; then
 | |
|         cp_portable "$tmpdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"
 | |
|         cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s390/"
 | |
|         cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s390/"
 | |
|     fi
 | |
|     if [ $arch = arm ]; then
 | |
|         cp "$tmpdir/include/asm/unistd-eabi.h" "$output/linux-headers/asm-arm/"
 | |
|         cp "$tmpdir/include/asm/unistd-oabi.h" "$output/linux-headers/asm-arm/"
 | |
|         cp "$tmpdir/include/asm/unistd-common.h" "$output/linux-headers/asm-arm/"
 | |
|     fi
 | |
|     if [ $arch = x86 ]; then
 | |
|         cat <<-EOF >"$output/include/standard-headers/asm-x86/hyperv.h"
 | |
|         /* this is a temporary placeholder until kvm_para.h stops including it */
 | |
| EOF
 | |
|         cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
 | |
|         cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
 | |
|         cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
 | |
|     fi
 | |
| done
 | |
| 
 | |
| rm -rf "$output/linux-headers/linux"
 | |
| mkdir -p "$output/linux-headers/linux"
 | |
| for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \
 | |
|               psci.h psp-sev.h userfaultfd.h; do
 | |
|     cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
 | |
| done
 | |
| rm -rf "$output/linux-headers/asm-generic"
 | |
| mkdir -p "$output/linux-headers/asm-generic"
 | |
| for header in kvm_para.h; do
 | |
|     cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
 | |
| done
 | |
| if [ -L "$linux/source" ]; then
 | |
|     cp "$linux/source/COPYING" "$output/linux-headers"
 | |
| else
 | |
|     cp "$linux/COPYING" "$output/linux-headers"
 | |
| fi
 | |
| 
 | |
| cat <<EOF >$output/linux-headers/asm-x86/hyperv.h
 | |
| #include "standard-headers/asm-x86/hyperv.h"
 | |
| EOF
 | |
| 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
 | |
| 
 | |
| rm -rf "$output/include/standard-headers/linux"
 | |
| mkdir -p "$output/include/standard-headers/linux"
 | |
| for i in "$tmpdir"/include/linux/*virtio*.h "$tmpdir/include/linux/input.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/sysinfo.h"; do
 | |
|     cp_portable "$i" "$output/include/standard-headers/linux"
 | |
| done
 | |
| mkdir -p "$output/include/standard-headers/drm"
 | |
| cp_portable "$tmpdir/include/drm/drm_fourcc.h" \
 | |
|             "$output/include/standard-headers/drm"
 | |
| 
 | |
| rm -rf "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"
 | |
| mkdir -p "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"
 | |
| 
 | |
| # Remove the unused functions from pvrdma_verbs.h avoiding the unnecessary
 | |
| # import of several infiniband/networking/other headers
 | |
| tmp_pvrdma_verbs="$tmpdir/pvrdma_verbs.h"
 | |
| # Parse the entire file instead of single lines to match
 | |
| # function declarations expanding over multiple lines
 | |
| # and strip the declarations starting with pvrdma prefix.
 | |
| sed  -e '1h;2,$H;$!d;g'  -e 's/[^};]*pvrdma[^(| ]*([^)]*);//g' \
 | |
|     "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h" > \
 | |
|     "$tmp_pvrdma_verbs";
 | |
| 
 | |
| for i in "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h" \
 | |
|          "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h" \
 | |
|          "$tmp_pvrdma_verbs"; do \
 | |
|     cp_portable "$i" \
 | |
|          "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/"
 | |
| done
 | |
| 
 | |
| rm -rf "$output/include/standard-headers/rdma/"
 | |
| mkdir -p "$output/include/standard-headers/rdma/"
 | |
| for i in "$tmpdir/include/rdma/vmw_pvrdma-abi.h"; do
 | |
|     cp_portable "$i" \
 | |
|          "$output/include/standard-headers/rdma/"
 | |
| done
 | |
| 
 | |
| cat <<EOF >$output/include/standard-headers/linux/types.h
 | |
| /* For QEMU all types are already defined via osdep.h, so this
 | |
|  * header does not need to do anything.
 | |
|  */
 | |
| EOF
 | |
| cat <<EOF >$output/include/standard-headers/linux/if_ether.h
 | |
| #define ETH_ALEN    6
 | |
| EOF
 | |
| 
 | |
| rm -rf "$tmpdir"
 |