summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell2012-08-03 14:51:25 +0200
committerAvi Kivity2012-08-09 15:16:45 +0200
commit08312a63b77df45ad056d2e8d9e2cbe8f683a23c (patch)
treef0b9b158dc3b82f5ad08562bd0136e1deb4f192b
parentkvm: Check if smp_cpus exceeds max cpus supported by kvm (diff)
downloadqemu-08312a63b77df45ad056d2e8d9e2cbe8f683a23c.tar.gz
qemu-08312a63b77df45ad056d2e8d9e2cbe8f683a23c.tar.xz
qemu-08312a63b77df45ad056d2e8d9e2cbe8f683a23c.zip
configure: Don't implicitly hardcode list of KVM architectures
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 <peter.maydell@linaro.org> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rwxr-xr-xconfigure14
1 files changed, 11 insertions, 3 deletions
diff --git a/configure b/configure
index 280726c3f8..b9a0b2741e 100755
--- a/configure
+++ b/configure
@@ -3538,15 +3538,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