From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTUn0-0008In-M8 for qemu-devel@nongnu.org; Wed, 31 Oct 2012 05:40:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTUmq-0003AV-Ox for qemu-devel@nongnu.org; Wed, 31 Oct 2012 05:40:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTUmq-0003A4-EY for qemu-devel@nongnu.org; Wed, 31 Oct 2012 05:40:36 -0400 From: Marcelo Tosatti Date: Wed, 31 Oct 2012 07:40:06 -0200 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 28/28] update-linux-headers.sh: Handle new kernel uapi/ directories List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Peter Maydell , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org From: Peter Maydell 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 Signed-off-by: Marcelo Tosatti --- scripts/update-linux-headers.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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.6.4