From patchwork Mon Oct 22 11:54:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12394 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9104123EF8 for ; Mon, 22 Oct 2012 11:54:47 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 17AE1A19918 for ; Mon, 22 Oct 2012 11:54:46 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3273363iej.11 for ; Mon, 22 Oct 2012 04:54:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=oj/gF2d7+iWwsPXNo0y9sJ1BnJ/uA9rhSPF5HPdYBmQ=; b=ioaXdwBCtzkig/QbE423vuPl8QlV1FaY1MkkVbQTdqBeJTYw65WdGrrDLb2a/QXRjg +kHDQUqn8ohwkZs8UEh7CcM8qNpPoLgU99+PuJeH41HolVRcUTnbnZejxVRACH8lwwnl IXdFfC2fnPoDFb6htvM4RN3fi6GdZjoqIIkoxDSHwOyk9i1KELVm5SZRPW02Qg8c5fcC dhebDnFw8ig0qbFyvJjClovhKrk4Y2x5WPio3aLXGKg7NMEe14z3FoV9g6yO3rZbpGrA vpV8cZG1QT6KkUH9rMm7OWXjQNXlpwH0EJ/+l77Pa1YIb36X1wXP1orSEoBKdWIAOfOp 07Ug== Received: by 10.50.91.195 with SMTP id cg3mr15830060igb.57.1350906886489; Mon, 22 Oct 2012 04:54:46 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp218025igt; Mon, 22 Oct 2012 04:54:45 -0700 (PDT) Received: by 10.180.102.131 with SMTP id fo3mr36527553wib.1.1350906885082; Mon, 22 Oct 2012 04:54:45 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id g47si9319948wep.42.2012.10.22.04.54.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Oct 2012 04:54:45 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TQGad-0008G4-7d; Mon, 22 Oct 2012 12:54:39 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Avi Kivity , Marcelo Tosatti , kvm@vger.kernel.org, Jan Kiszka Subject: [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories Date: Mon, 22 Oct 2012 12:54:39 +0100 Message-Id: <1350906879-31721-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQnzMMKm4ayFKBwAQ9QC6TNr/IAC8n5PE8bjG01wbb8ArNKhpr8aKb2jUPzyxIQ1h+6TT9ES 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