From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQGau-0005td-OU for qemu-devel@nongnu.org; Mon, 22 Oct 2012 07:55:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQGaq-0007vb-AG for qemu-devel@nongnu.org; Mon, 22 Oct 2012 07:54:56 -0400 Received: from 38.0.169.217.in-addr.arpa ([217.169.0.38]:51889 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQGaq-0007u4-3A for qemu-devel@nongnu.org; Mon, 22 Oct 2012 07:54:52 -0400 From: Peter Maydell Date: Mon, 22 Oct 2012 12:54:39 +0100 Message-Id: <1350906879-31721-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , Jan Kiszka , Avi Kivity , kvm@vger.kernel.org, patches@linaro.org Recent kernels have moved to keeping the userspace headers in uapi/ subdirectories. This breaks the detection of whether an architecture has KVM support in the kernel because kvm.h has moved in the kernel source tree. Update the check to support both the old and new locations. Signed-off-by: Peter Maydell --- This would otherwise cause us to ignore the architectures which have moved over to uapi/ (which for QEMU's purposes means "everything but x86"...) scripts/update-linux-headers.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 67be2ef..4c7b566 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -34,7 +34,8 @@ 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" ]; then + if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ] && + ! [ -e "$linux/arch/$arch/include/uapi/asm/kvm.h" ] ; then continue fi -- 1.7.9.5