Re: [Qemu-devel] Re: POLL: Why do you use kqemu?

[Anthony Liguori <anthony@codemonkey.ws>]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

Avi Kivity wrote:
> Blue Swirl wrote:
>> I found a bug in configure, if there are targets that can't use KVM,
>> it is disabled for all targets.
>>   
>
> Yes.  kvm support should be an array, not a scalar.  Note we shouldn't 
> even attempt kvm if the host and target don't match.

It doesn't need to be an array.  Something like this should work.

Regards,

Anthony Liguori

[-- Attachment #2: kvm-configure.patch --]
[-- Type: text/x-patch, Size: 2494 bytes --]

commit 75081cfc8a0cba8fe1760f8fc861c3dc3fba6fd1
Author: Anthony Liguori <aliguori@us.ibm.com>
Date:   Sun Jun 7 13:35:41 2009 -0500

    Don't globally disable kvm if one target doesn't support it
    
    When iterating through each element in target_list, we disable kvm if we find
    a target that doesn't support kvm.  This means that kvm can get globally
    disabled when configuring with multiple targets.
    
    Instead, use a new variable, has_kvm, to indicate whether the target has kvm
    support or not.
    
    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/configure b/configure
index 6ab4d80..f89327c 100755
--- a/configure
+++ b/configure
@@ -1828,16 +1828,18 @@ interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
 echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
 gdb_xml_files=""
 
+has_kvm="$kvm"
+
 # Make sure the target and host cpus are compatible
 if test "$kvm" = "yes" -a ! \( "$target_cpu" = "$cpu" -o \
   \( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \
   \( "$target_cpu" = "x86_64" -a "$cpu" = "i386"   \) -o \
   \( "$target_cpu" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
-  kvm="no"
+  has_kvm="no"
 fi
 # Disable KVM for linux-user
 if test "$kvm" = "yes" -a "$target_softmmu" = "no" ; then
-  kvm="no"
+  has_kvm="no"
 fi
 
 case "$target_cpu" in
@@ -1850,7 +1852,7 @@ case "$target_cpu" in
       echo "CONFIG_KQEMU=yes" >> $config_mak
       echo "#define CONFIG_KQEMU 1" >> $config_h
     fi
-    if test "$kvm" = "yes" ; then
+    if test "$has_kvm" = "yes" ; then
       echo "CONFIG_KVM=yes" >> $config_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
       echo "#define CONFIG_KVM 1" >> $config_h
@@ -1872,7 +1874,7 @@ case "$target_cpu" in
       echo "CONFIG_KQEMU=yes" >> $config_mak
       echo "#define CONFIG_KQEMU 1" >> $config_h
     fi
-    if test "$kvm" = "yes" ; then
+    if test "$has_kvm" = "yes" ; then
       echo "CONFIG_KVM=yes" >> $config_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
       echo "#define CONFIG_KVM 1" >> $config_h
@@ -1949,7 +1951,7 @@ case "$target_cpu" in
     echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
     echo "#define TARGET_PPC 1" >> $config_h
     echo "#define TARGET_PPCEMB 1" >> $config_h
-    if test "$kvm" = "yes" ; then
+    if test "$has_kvm" = "yes" ; then
       echo "CONFIG_KVM=yes" >> $config_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
       echo "#define CONFIG_KVM 1" >> $config_h