From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyLRP-0005xR-Om for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:52:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyLRN-0002tP-1L for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:52:55 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55412 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eyLRM-0002su-SM for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:52:52 -0400 Date: Tue, 20 Mar 2018 19:52:51 +0200 From: "Michael S. Tsirkin" Message-ID: <1521568357-114127-2-git-send-email-mst@redhat.com> References: <1521568357-114127-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1521568357-114127-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH v3 1/2] update-linux-headers.sh: add unistd.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Peter Maydell , Juan Quintela , Cornelia Huck , Roman Kagan , Paolo Bonzini , Stefan Hajnoczi , Yuval Shaia Rework the update script slightly, add the unistd.h header and its dependencies on all architectures. This also removes the IA64 from a KVM blacklist (Linux dropped this architecture for KVM), and adds a comment so we remember to try and un-blacklist KVM on MIPS. Signed-off-by: Michael S. Tsirkin --- scripts/update-linux-headers.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index d18e2f1..0999ccf 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -80,11 +80,6 @@ for arch in $ARCHLIST; do 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 @@ -95,9 +90,20 @@ for arch in $ARCHLIST; do 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 + for header in unistd.h bitsperlong.h; do cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" done + + # Below blacklists KVM on MIPS since we did this historically, even though + # KVM on MIPS is supposed to be properly supported these days. + # TODO: we should not be blacklisting it, but instead sorting out whatever + # issues it has that made us exclude it. + if [ "$arch" != "mips" ]; then + for header in kvm.h kvm_para.h; do + cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" + done + fi + if [ $arch = powerpc ]; then cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/" fi @@ -130,7 +136,7 @@ for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \ done rm -rf "$output/linux-headers/asm-generic" mkdir -p "$output/linux-headers/asm-generic" -for header in kvm_para.h; do +for header in kvm_para.h bitsperlong.h unistd.h; do cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic" done if [ -L "$linux/source" ]; then -- MST