Merge commit '3a3fb96d0d9e3331e3beb672108ec18a6d3d8c1c' into upstream-merge

* commit '3a3fb96d0d9e3331e3beb672108ec18a6d3d8c1c':
  configure: Fix spelling in comment and rework the comment
  qemu-io: build on all platforms
  slirp: fix use-after-free
  ARM PBX-A9 board support
  ARM Cortex-A9 cpu support
  ARM FP16 support
  Built network devices once
  sb16: remove highspeed reset code
  audio: Remove conditional around sw which can not be NULL
  audio: link with -lpulse in addition to -lpulse-simple
  Fix typo
  Fix mingw32 build
  Prevent configuring for a user emulator on a different type of OS

Conflicts:
	configure

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 26 insertions, 14 deletions

diff --git a/configure b/configure
index a3687f964..376c4583e 100755
--- a/configure
+++ b/configure
@@ -179,15 +179,17 @@ kvm_version() {
     fi
 }
 
-# Default value for a variable defining feature "foo"
-#  * foo="no", feature will only be used if --enable-foo arg is given
-#  * foo="", feature will be searched for, and if found, will be used
-#  * foo="yes", this value vill only be set by --enable-foo flag.
-#                   feature will searched for, if not found, configure exits with error
+# Default value for a variable defining feature "foo".
+#  * foo="no"  feature will only be used if --enable-foo arg is given
+#  * foo=""    feature will be searched for, and if found, will be used
+#              unless --disable-foo is given
+#  * foo="yes" this value will only be set by --enable-foo flag.
+#              feature will searched for,
+#              if not found, configure exits with error
 #
-# Always add --enable-foo and --disable-foo command line args.  Distributions want
-# to ensure that several features are compiled in, and it is impossible without a
-# --enable-foo that exits if feature is not found
+# Always add --enable-foo and --disable-foo command line args.
+# Distributions want to ensure that several features are compiled in, and it
+# is impossible without a --enable-foo that exits if a feature is not found.
 
 bluez=""
 brlapi=""
@@ -1205,9 +1207,9 @@ for drv in $audio_drv_list; do
     ;;
 
     pa)
-    audio_drv_probe $drv pulse/simple.h -lpulse-simple \
+    audio_drv_probe $drv pulse/simple.h "-lpulse-simple -lpulse" \
         "pa_simple *s = NULL; pa_simple_free(s); return 0;"
-    libs_softmmu="-lpulse-simple $libs_softmmu"
+    libs_softmmu="-lpulse -lpulse-simple $libs_softmmu"
     audio_pt_int="yes"
     ;;
 
@@ -2253,15 +2255,13 @@ echo "KVM_KMOD=$kvm_kmod" >> $config_host_mak
 
 tools=
 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
-  tools="qemu-img\$(EXESUF) $tools"
+  tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
   if [ "$linux" = "yes" ] ; then
-      tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
+      tools="qemu-nbd\$(EXESUF) $tools"
     if [ "$check_utests" = "yes" ]; then
       tools="check-qint check-qstring check-qdict check-qlist $tools"
       tools="check-qfloat check-qjson $tools"
     fi
-  elif test "$mingw32" = "yes" ; then
-      tools="qemu-io\$(EXESUF) $tools"
   fi
 fi
 echo "TOOLS=$tools" >> $config_host_mak
@@ -2338,14 +2338,26 @@ case "$target" in
     target_softmmu="yes"
     ;;
   ${target_arch2}-linux-user)
+    if test "$linux" != "yes" ; then
+      echo "ERROR: Target '$target' is only available on a Linux host"
+      exit 1
+    fi
     target_user_only="yes"
     target_linux_user="yes"
     ;;
   ${target_arch2}-darwin-user)
+    if test "$darwin" != "yes" ; then
+      echo "ERROR: Target '$target' is only available on a Darwin host"
+      exit 1
+    fi
     target_user_only="yes"
     target_darwin_user="yes"
     ;;
   ${target_arch2}-bsd-user)
+    if test "$bsd" != "yes" ; then
+      echo "ERROR: Target '$target' is only available on a BSD host"
+      exit 1
+    fi
     target_user_only="yes"
     target_bsd_user="yes"
     ;;