Commit 1b0c87fc0f5fb39eca22f26cab9a8e4ffd32a6e7
Committed by
Anthony Liguori
1 parent
9637443f
configure xen in a single place
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
1 changed file
with
7 additions
and
10 deletions
configure
| @@ -1993,11 +1993,6 @@ case "$target_arch2" in | @@ -1993,11 +1993,6 @@ case "$target_arch2" in | ||
| 1993 | echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak | 1993 | echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak |
| 1994 | echo "#define CONFIG_KVM 1" >> $config_h | 1994 | echo "#define CONFIG_KVM 1" >> $config_h |
| 1995 | fi | 1995 | fi |
| 1996 | - if test "$xen" = "yes" -a "$target_softmmu" = "yes"; | ||
| 1997 | - then | ||
| 1998 | - echo "CONFIG_XEN=y" >> $config_mak | ||
| 1999 | - echo "#define CONFIG_XEN 1" >> $config_h | ||
| 2000 | - fi | ||
| 2001 | target_phys_bits=32 | 1996 | target_phys_bits=32 |
| 2002 | ;; | 1997 | ;; |
| 2003 | x86_64) | 1998 | x86_64) |
| @@ -2016,11 +2011,6 @@ case "$target_arch2" in | @@ -2016,11 +2011,6 @@ case "$target_arch2" in | ||
| 2016 | echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak | 2011 | echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak |
| 2017 | echo "#define CONFIG_KVM 1" >> $config_h | 2012 | echo "#define CONFIG_KVM 1" >> $config_h |
| 2018 | fi | 2013 | fi |
| 2019 | - if test "$xen" = "yes" -a "$target_softmmu" = "yes" | ||
| 2020 | - then | ||
| 2021 | - echo "CONFIG_XEN=y" >> $config_mak | ||
| 2022 | - echo "#define CONFIG_XEN 1" >> $config_h | ||
| 2023 | - fi | ||
| 2024 | target_phys_bits=64 | 2014 | target_phys_bits=64 |
| 2025 | ;; | 2015 | ;; |
| 2026 | alpha) | 2016 | alpha) |
| @@ -2177,6 +2167,13 @@ esac | @@ -2177,6 +2167,13 @@ esac | ||
| 2177 | if [ $target_phys_bits -lt $hostlongbits ] ; then | 2167 | if [ $target_phys_bits -lt $hostlongbits ] ; then |
| 2178 | target_phys_bits=$hostlongbits | 2168 | target_phys_bits=$hostlongbits |
| 2179 | fi | 2169 | fi |
| 2170 | +case "$target_arch2" in | ||
| 2171 | + i386|x86_64) | ||
| 2172 | + if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then | ||
| 2173 | + echo "CONFIG_XEN=y" >> $config_mak | ||
| 2174 | + echo "#define CONFIG_XEN 1" >> $config_h | ||
| 2175 | + fi | ||
| 2176 | +esac | ||
| 2180 | echo "HWLIB=../libhw$target_phys_bits/libqemuhw$target_phys_bits.a" >> $config_mak | 2177 | echo "HWLIB=../libhw$target_phys_bits/libqemuhw$target_phys_bits.a" >> $config_mak |
| 2181 | echo "#define TARGET_PHYS_ADDR_BITS $target_phys_bits" >> $config_h | 2178 | echo "#define TARGET_PHYS_ADDR_BITS $target_phys_bits" >> $config_h |
| 2182 | echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak | 2179 | echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak |