Re: [Qemu-devel] [PATCH 11/19] configure xen in a single place

[Christoph Egger <Christoph.Egger@amd.com>]

On Thursday 02 July 2009 16:46:35 quintela@redhat.com wrote:
> From: Juan Quintela <quintela@redhat.com>
>
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  configure |   17 +++++++----------
>  1 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/configure b/configure
> index 5b35b69..56e4d38 100755
> --- a/configure
> +++ b/configure
> @@ -1991,11 +1991,6 @@ case "$target_cpu" in
>        echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
>        echo "#define CONFIG_KVM 1" >> $config_h
>      fi
> -    if test "$xen" = "yes" -a "$target_softmmu" = "yes";
> -    then
> -      echo "CONFIG_XEN=y" >> $config_mak
> -      echo "#define CONFIG_XEN 1" >> $config_h
> -    fi
>      target_phys_bits=32
>    ;;
>    x86_64)
> @@ -2014,11 +2009,6 @@ case "$target_cpu" in
>        echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
>        echo "#define CONFIG_KVM 1" >> $config_h
>      fi
> -    if test "$xen" = "yes" -a "$target_softmmu" = "yes"
> -    then
> -      echo "CONFIG_XEN=y" >> $config_mak
> -      echo "#define CONFIG_XEN 1" >> $config_h
> -    fi
>      target_phys_bits=64
>    ;;
>    alpha)
> @@ -2174,6 +2164,13 @@ esac
>  if [ $target_phys_bits -lt $hostlongbits ] ; then
>    target_phys_bits=$hostlongbits
>  fi
> +case "$target_cpu" in
> +  i386|x86_64)

If 'target_cpu' is set by 'uname -m' then this has to be

+  i386|x86_64|amd64)

or you will break *BSD, otherwise.

> +    if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
> +      echo "CONFIG_XEN=y" >> $config_mak
> +      echo "#define CONFIG_XEN 1" >> $config_h
> +    fi
> +esac
>  echo "HWLIB=../libhw$target_phys_bits/libqemuhw$target_phys_bits.a" >>
> $config_mak echo "#define TARGET_PHYS_ADDR_BITS $target_phys_bits" >>
> $config_h echo "subdir-$target: subdir-libhw$target_phys_bits" >>
> $config_host_mak



-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632