From patchwork Wed Jul 18 10:11:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 171628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 279A92C03A4 for ; Wed, 18 Jul 2012 20:11:30 +1000 (EST) Received: from localhost ([::1]:57644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrRE8-0005Gq-If for incoming@patchwork.ozlabs.org; Wed, 18 Jul 2012 06:11:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrRDw-0005Gc-VU for qemu-devel@nongnu.org; Wed, 18 Jul 2012 06:11:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrRDs-0004ra-FV for qemu-devel@nongnu.org; Wed, 18 Jul 2012 06:11:16 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:34746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrRDs-0004rS-94 for qemu-devel@nongnu.org; Wed, 18 Jul 2012 06:11:12 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SrRDp-0003GU-5R; Wed, 18 Jul 2012 11:11:09 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Wed, 18 Jul 2012 11:11:09 +0100 Message-Id: <1342606269-12527-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Jan Kiszka , patches@linaro.org Subject: [Qemu-devel] [PATCH] update-linux-headers.sh: Don't hard code list of architectures X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rather than hardcoding the list of architectures in the kernel header update script, just import headers for every architecture which supports KVM (with a blacklist exception for ia64 which has KVM headers but is dead). This reduces the number of QEMU files which need to be updated to add support for a new KVM architecture. Signed-off-by: Peter Maydell Acked-by: Jan Kiszka --- Changes v1->v2: * added a blacklist for ia64, to avoid noise and importing a pointless set of headers that will get dropped later scripts/update-linux-headers.sh | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 9d2a4bc..57ce69f 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -28,7 +28,21 @@ if [ -z "$output" ]; then output="$PWD" fi -for arch in x86 powerpc s390; do +# 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" ]; then + continue + fi + + # Blacklist architectures which have KVM headers but are actually dead + if [ "$arch" = "ia64" ]; then + continue + fi + make -C "$linux" INSTALL_HDR_PATH="$tmpdir" SRCARCH=$arch headers_install rm -rf "$output/linux-headers/asm-$arch"