From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrS9c-0002D2-UN for qemu-devel@nongnu.org; Wed, 18 Jul 2012 07:10:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrS9b-0007Br-Qy for qemu-devel@nongnu.org; Wed, 18 Jul 2012 07:10:52 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:43053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrS9b-0007Bc-Ji for qemu-devel@nongnu.org; Wed, 18 Jul 2012 07:10:51 -0400 From: Peter Maydell Date: Wed, 18 Jul 2012 12:10:49 +0100 Message-Id: <1342609849-12618-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] configure: Don't implicitly hardcode list of KVM architectures List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org The code creating the symlink from linux-headers/asm to the architecture specific linux-headers/asm-$arch directory was implicitly hardcoding a list of KVM supporting architectures. Add a default case for the common "Linux architecture name and QEMU CPU name match" case, so future architectures will only need to add code if they've managed to get mismatched names. Signed-off-by: Peter Maydell --- This means there's now only one place where configure has a list of KVM enabled targets (the check where we set CONFIG_KVM). I think we have to have one list, but we don't need to have more than one... NB: this patch means we'll now set up an asm/ link for s390 as well as s390x. That should be harmless (s390 can't be trying to include any headers from asm/ or it wouldn't build). configure | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0a3896e..c8d2895 100755 --- a/configure +++ b/configure @@ -3482,15 +3482,23 @@ if test "$linux" = "yes" ; then mkdir -p linux-headers case "$cpu" in i386|x86_64) - symlink "$source_path/linux-headers/asm-x86" linux-headers/asm + linux_arch=x86 ;; ppcemb|ppc|ppc64) - symlink "$source_path/linux-headers/asm-powerpc" linux-headers/asm + linux_arch=powerpc ;; s390x) - symlink "$source_path/linux-headers/asm-s390" linux-headers/asm + linux_arch=s390 + ;; + *) + # For most CPUs the kernel architecture name and QEMU CPU name match. + linux_arch="$cpu" ;; esac + # For non-KVM architectures we will not have asm headers. + if [ -e "$source_path/linux-headers/asm-$linux_arch" ]; then + symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm + fi fi for target in $target_list; do -- 1.7.5.4