diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-29 09:42:12 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-29 09:42:12 -0500 |
commit | 3046c984049070ab5843da1753ce3a22e25b52cd (patch) | |
tree | eb706dd61603bbce9d669fb2f35bd06688cdf396 /configure | |
parent | e374560232776d4141866abc9f520c132b394926 (diff) | |
parent | 679f4f8b178e7c66fbc2f39c905374ee8663d5d8 (diff) | |
download | qemu-3046c984049070ab5843da1753ce3a22e25b52cd.zip qemu-3046c984049070ab5843da1753ce3a22e25b52cd.tar.gz qemu-3046c984049070ab5843da1753ce3a22e25b52cd.tar.bz2 |
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -3295,10 +3295,12 @@ case "$target_arch2" in if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then target_phys_bits=64 echo "CONFIG_XEN=y" >> $config_target_mak - if test "$cpu" = "i386" -o "$cpu" = "x86_64"; then - echo "CONFIG_XEN_MAPCACHE=y" >> $config_target_mak - fi + else + echo "CONFIG_NO_XEN=y" >> $config_target_mak fi + ;; + *) + echo "CONFIG_NO_XEN=y" >> $config_target_mak esac case "$target_arch2" in i386|x86_64|ppcemb|ppc|ppc64|s390x) |