pckbd: adding new fields to vmstate

[qemu.git] / configure

diff --git a/configure b/configure
index 0e516f9e2aa136b1b8fe18fe5cc30ed59c533c95..961bf6fd4396c9e2c5ce57e930b14782b47429f3 100755 (executable)
--- a/configure
+++ b/configure
@@ -3,6 +3,11 @@
 # qemu configure script (c) 2003 Fabrice Bellard
 #
 
 # qemu configure script (c) 2003 Fabrice Bellard
 #
 

+# Unset some variables known to interfere with behavior of common tools,
+# just as autoconf does.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+

 # Temporary directory used for files created while
 # configure runs. Since it is in the build directory
 # we can safely blow away any previous version of it
 # Temporary directory used for files created while
 # configure runs. Since it is in the build directory
 # we can safely blow away any previous version of it


@@ -182,6 +187,10 @@ path_of() {
     return 1
 }
 
     return 1
 }
 

+have_backend () {
+    echo "$trace_backends" | grep "$1" >/dev/null
+}
+

 # default parameters
 source_path=`dirname "$0"`
 cpu=""
 # default parameters
 source_path=`dirname "$0"`
 cpu=""


@@ -293,7 +302,7 @@ pkgversion=""
 pie=""
 zero_malloc=""
 qom_cast_debug="yes"
 pie=""
 zero_malloc=""
 qom_cast_debug="yes"

-trace_backend="nop"
+trace_backends="nop"

 trace_file="trace"
 spice=""
 rbd=""
 trace_file="trace"
 spice=""
 rbd=""


@@ -302,8 +311,8 @@ libusb=""
 usb_redir=""
 glx=""
 zlib="yes"
 usb_redir=""
 glx=""
 zlib="yes"

-lzo="no"
-snappy="no"
+lzo=""
+snappy=""

 guest_agent=""
 guest_agent_with_vss="no"
 vss_win32_sdk=""
 guest_agent=""
 guest_agent_with_vss="no"
 vss_win32_sdk=""


@@ -317,14 +326,16 @@ seccomp=""
 glusterfs=""
 glusterfs_discard="no"
 glusterfs_zerofill="no"
 glusterfs=""
 glusterfs_discard="no"
 glusterfs_zerofill="no"

+archipelago=""

 virtio_blk_data_plane=""
 gtk=""
 gtkabi=""
 vte=""
 virtio_blk_data_plane=""
 gtk=""
 gtkabi=""
 vte=""

-tpm="no"
+tpm="yes"

 libssh2=""
 vhdx=""
 libssh2=""
 vhdx=""

-quorum="no"
+quorum=""
+numa=""

 
 # parse CC options first
 for opt do
 
 # parse CC options first
 for opt do


@@ -537,6 +548,9 @@ fi
 
 # OS specific
 
 
 # OS specific
 

+# host *BSD for user mode
+HOST_VARIANT_DIR=""
+

 case $targetos in
 CYGWIN*)
   mingw32="yes"
 case $targetos in
 CYGWIN*)
   mingw32="yes"


@@ -562,12 +576,14 @@ FreeBSD)
   # needed for kinfo_getvmmap(3) in libutil.h
   LIBS="-lutil $LIBS"
   netmap=""  # enable netmap autodetect
   # needed for kinfo_getvmmap(3) in libutil.h
   LIBS="-lutil $LIBS"
   netmap=""  # enable netmap autodetect

+  HOST_VARIANT_DIR="freebsd"

 ;;
 DragonFly)
   bsd="yes"
   make="${MAKE-gmake}"
   audio_drv_list="oss"
   audio_possible_drivers="oss sdl esd pa"
 ;;
 DragonFly)
   bsd="yes"
   make="${MAKE-gmake}"
   audio_drv_list="oss"
   audio_possible_drivers="oss sdl esd pa"

+  HOST_VARIANT_DIR="dragonfly"

 ;;
 NetBSD)
   bsd="yes"
 ;;
 NetBSD)
   bsd="yes"


@@ -575,12 +591,14 @@ NetBSD)
   audio_drv_list="oss"
   audio_possible_drivers="oss sdl esd"
   oss_lib="-lossaudio"
   audio_drv_list="oss"
   audio_possible_drivers="oss sdl esd"
   oss_lib="-lossaudio"

+  HOST_VARIANT_DIR="netbsd"

 ;;
 OpenBSD)
   bsd="yes"
   make="${MAKE-gmake}"
   audio_drv_list="sdl"
   audio_possible_drivers="sdl esd"
 ;;
 OpenBSD)
   bsd="yes"
   make="${MAKE-gmake}"
   audio_drv_list="sdl"
   audio_possible_drivers="sdl esd"

+  HOST_VARIANT_DIR="openbsd"

 ;;
 Darwin)
   bsd="yes"
 ;;
 Darwin)
   bsd="yes"


@@ -598,6 +616,7 @@ Darwin)
   # Disable attempts to use ObjectiveC features in os/object.h since they
   # won't work when we're compiling with gcc as a C compiler.
   QEMU_CFLAGS="-DOS_OBJECT_USE_OBJC=0 $QEMU_CFLAGS"
   # Disable attempts to use ObjectiveC features in os/object.h since they
   # won't work when we're compiling with gcc as a C compiler.
   QEMU_CFLAGS="-DOS_OBJECT_USE_OBJC=0 $QEMU_CFLAGS"

+  HOST_VARIANT_DIR="darwin"

 ;;
 SunOS)
   solaris="yes"
 ;;
 SunOS)
   solaris="yes"


@@ -753,7 +772,10 @@ for opt do
   ;;
   --target-list=*) target_list="$optarg"
   ;;
   ;;
   --target-list=*) target_list="$optarg"
   ;;

-  --enable-trace-backend=*) trace_backend="$optarg"
+  --enable-trace-backends=*) trace_backends="$optarg"
+  ;;
+  # XXX: backwards compatibility
+  --enable-trace-backend=*) trace_backends="$optarg"

   ;;
   --with-trace-file=*) trace_file="$optarg"
   ;;
   ;;
   --with-trace-file=*) trace_file="$optarg"
   ;;


@@ -1030,8 +1052,12 @@ for opt do
   ;;
   --disable-zlib-test) zlib="no"
   ;;
   ;;
   --disable-zlib-test) zlib="no"
   ;;

+  --disable-lzo) lzo="no"
+  ;;

   --enable-lzo) lzo="yes"
   ;;
   --enable-lzo) lzo="yes"
   ;;

+  --disable-snappy) snappy="no"
+  ;;

   --enable-snappy) snappy="yes"
   ;;
   --enable-guest-agent) guest_agent="yes"
   --enable-snappy) snappy="yes"
   ;;
   --enable-guest-agent) guest_agent="yes"


@@ -1062,6 +1088,10 @@ for opt do
   ;;
   --enable-glusterfs) glusterfs="yes"
   ;;
   ;;
   --enable-glusterfs) glusterfs="yes"
   ;;

+  --disable-archipelago) archipelago="no"
+  ;;
+  --enable-archipelago) archipelago="yes"
+  ;;

   --disable-virtio-blk-data-plane) virtio_blk_data_plane="no"
   ;;
   --enable-virtio-blk-data-plane) virtio_blk_data_plane="yes"
   --disable-virtio-blk-data-plane) virtio_blk_data_plane="no"
   ;;
   --enable-virtio-blk-data-plane) virtio_blk_data_plane="yes"


@@ -1080,6 +1110,8 @@ for opt do
   ;;
   --enable-vte) vte="yes"
   ;;
   ;;
   --enable-vte) vte="yes"
   ;;

+  --disable-tpm) tpm="no"
+  ;;

   --enable-tpm) tpm="yes"
   ;;
   --disable-libssh2) libssh2="no"
   --enable-tpm) tpm="yes"
   ;;
   --disable-libssh2) libssh2="no"


@@ -1094,6 +1126,10 @@ for opt do
   ;;
   --enable-quorum) quorum="yes"
   ;;
   ;;
   --enable-quorum) quorum="yes"
   ;;

+  --disable-numa) numa="no"
+  ;;
+  --enable-numa) numa="yes"
+  ;;

   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"


@@ -1320,7 +1356,7 @@ Advanced options (experts only):
   --disable-docs           disable documentation build
   --disable-vhost-net      disable vhost-net acceleration support
   --enable-vhost-net       enable vhost-net acceleration support
   --disable-docs           disable documentation build
   --disable-vhost-net      disable vhost-net acceleration support
   --enable-vhost-net       enable vhost-net acceleration support

-  --enable-trace-backend=B Set trace backend
+  --enable-trace-backends=B Set trace backend

                            Available backends: $($python $source_path/scripts/tracetool.py --list-backends)
   --with-trace-file=NAME   Full PATH,NAME of file to store traces
                            Default:trace-<pid>
                            Available backends: $($python $source_path/scripts/tracetool.py --list-backends)
   --with-trace-file=NAME   Full PATH,NAME of file to store traces
                            Default:trace-<pid>


@@ -1351,8 +1387,11 @@ Advanced options (experts only):
   --enable-coroutine-pool  enable coroutine freelist (better performance)
   --enable-glusterfs       enable GlusterFS backend
   --disable-glusterfs      disable GlusterFS backend
   --enable-coroutine-pool  enable coroutine freelist (better performance)
   --enable-glusterfs       enable GlusterFS backend
   --disable-glusterfs      disable GlusterFS backend

+  --enable-archipelago     enable Archipelago backend
+  --disable-archipelago    disable Archipelago backend

   --enable-gcov            enable test coverage analysis with gcov
   --gcov=GCOV              use specified gcov [$gcov_tool]
   --enable-gcov            enable test coverage analysis with gcov
   --gcov=GCOV              use specified gcov [$gcov_tool]

+  --disable-tpm            disable TPM support

   --enable-tpm             enable TPM support
   --disable-libssh2        disable ssh block device support
   --enable-libssh2         enable ssh block device support
   --enable-tpm             enable TPM support
   --disable-libssh2        disable ssh block device support
   --enable-libssh2         enable ssh block device support


@@ -1360,6 +1399,8 @@ Advanced options (experts only):
   --enable-vhdx            enable support for the Microsoft VHDX image format
   --disable-quorum         disable quorum block filter support
   --enable-quorum          enable quorum block filter support
   --enable-vhdx            enable support for the Microsoft VHDX image format
   --disable-quorum         disable quorum block filter support
   --enable-quorum          enable quorum block filter support

+  --disable-numa           disable libnuma support
+  --enable-numa            enable libnuma support

 
 NOTE: The object files are built at the place where configure is launched
 EOF
 
 NOTE: The object files are built at the place where configure is launched
 EOF


@@ -1455,8 +1496,9 @@ for flag in $gcc_flags; do
     fi
 done
 
     fi
 done
 

-if test "$stack_protector" != "no" ; then
+if test "$stack_protector" != "no"; then

   gcc_flags="-fstack-protector-strong -fstack-protector-all"
   gcc_flags="-fstack-protector-strong -fstack-protector-all"

+  sp_on=0

   for flag in $gcc_flags; do
     # We need to check both a compile and a link, since some compiler
     # setups fail only on a .c->.o compile and some only at link time
   for flag in $gcc_flags; do
     # We need to check both a compile and a link, since some compiler
     # setups fail only on a .c->.o compile and some only at link time


@@ -1464,9 +1506,15 @@ if test "$stack_protector" != "no" ; then
        compile_prog "-Werror $flag" ""; then
       QEMU_CFLAGS="$QEMU_CFLAGS $flag"
       LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,$flag"
        compile_prog "-Werror $flag" ""; then
       QEMU_CFLAGS="$QEMU_CFLAGS $flag"
       LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,$flag"

+      sp_on=1

       break
     fi
   done
       break
     fi
   done

+  if test "$stack_protector" = yes; then
+    if test $sp_on = 0; then
+      error_exit "Stack protector not supported"
+    fi
+  fi

 fi
 
 # Workaround for http://gcc.gnu.org/PR55489.  Happens with -fPIE/-fPIC and
 fi
 
 # Workaround for http://gcc.gnu.org/PR55489.  Happens with -fPIE/-fPIC and


@@ -1677,6 +1725,20 @@ else
     echo big/little test failed
 fi
 
     echo big/little test failed
 fi
 

+##########################################
+# L2TPV3 probe
+
+cat > $TMPC <<EOF
+#include <sys/socket.h>
+#include <linux/ip.h>
+int main(void) { return sizeof(struct mmsghdr); }
+EOF
+if compile_prog "" "" ; then
+  l2tpv3=yes
+else
+  l2tpv3=no
+fi
+

 ##########################################
 # pkg-config probe
 
 ##########################################
 # pkg-config probe
 


@@ -1729,13 +1791,14 @@ if test "$lzo" != "no" ; then
 int main(void) { lzo_version(); return 0; }
 EOF
     if compile_prog "" "-llzo2" ; then
 int main(void) { lzo_version(); return 0; }
 EOF
     if compile_prog "" "-llzo2" ; then

-        :
+        libs_softmmu="$libs_softmmu -llzo2"
+        lzo="yes"

     else
     else

-        error_exit "lzo check failed" \
-            "Make sure to have the lzo libs and headers installed."
+        if test "$lzo" = "yes"; then
+            feature_not_found "liblzo2" "Install liblzo2 devel"
+        fi
+        lzo="no"

     fi
     fi

-
-    libs_softmmu="$libs_softmmu -llzo2"

 fi
 
 ##########################################
 fi
 
 ##########################################


@@ -1747,13 +1810,14 @@ if test "$snappy" != "no" ; then
 int main(void) { snappy_max_compressed_length(4096); return 0; }
 EOF
     if compile_prog "" "-lsnappy" ; then
 int main(void) { snappy_max_compressed_length(4096); return 0; }
 EOF
     if compile_prog "" "-lsnappy" ; then

-        :
+        libs_softmmu="$libs_softmmu -lsnappy"
+        snappy="yes"

     else
     else

-        error_exit "snappy check failed" \
-            "Make sure to have the snappy libs and headers installed."
+        if test "$snappy" = "yes"; then
+            feature_not_found "libsnappy" "Install libsnappy devel"
+        fi
+        snappy="no"

     fi
     fi

-
-    libs_softmmu="$libs_softmmu -lsnappy"

 fi
 
 ##########################################
 fi
 
 ##########################################


@@ -1986,6 +2050,7 @@ fi
 
 if test "$gtk" != "no"; then
     gtkpackage="gtk+-$gtkabi"
 
 if test "$gtk" != "no"; then
     gtkpackage="gtk+-$gtkabi"

+    gtkx11package="gtk+-x11-$gtkabi"

     if test "$gtkabi" = "3.0" ; then
       gtkversion="3.0.0"
     else
     if test "$gtkabi" = "3.0" ; then
       gtkversion="3.0.0"
     else


@@ -1994,6 +2059,9 @@ if test "$gtk" != "no"; then
     if $pkg_config --exists "$gtkpackage >= $gtkversion"; then
         gtk_cflags=`$pkg_config --cflags $gtkpackage`
         gtk_libs=`$pkg_config --libs $gtkpackage`
     if $pkg_config --exists "$gtkpackage >= $gtkversion"; then
         gtk_cflags=`$pkg_config --cflags $gtkpackage`
         gtk_libs=`$pkg_config --libs $gtkpackage`

+        if $pkg_config --exists "$gtkx11package >= $gtkversion"; then
+            gtk_libs="$gtk_libs -lX11"
+        fi

         libs_softmmu="$gtk_libs $libs_softmmu"
         gtk="yes"
     elif test "$gtk" = "yes"; then
         libs_softmmu="$gtk_libs $libs_softmmu"
         gtk="yes"
     elif test "$gtk" = "yes"; then


@@ -2195,9 +2263,12 @@ if compile_prog "$quorum_tls_cflags" "$quorum_tls_libs" ; then
   libs_softmmu="$quorum_tls_libs $libs_softmmu"
   libs_tools="$quorum_tls_libs $libs_softmmu"
   QEMU_CFLAGS="$QEMU_CFLAGS $quorum_tls_cflags"
   libs_softmmu="$quorum_tls_libs $libs_softmmu"
   libs_tools="$quorum_tls_libs $libs_softmmu"
   QEMU_CFLAGS="$QEMU_CFLAGS $quorum_tls_cflags"

+  quorum="yes"

 else
 else

-  echo "gnutls > 2.10.0 required to compile Quorum"
-  exit 1
+  if test "$quorum" = "yes"; then
+    feature_not_found "gnutls" "gnutls > 2.10.0 required to compile Quorum"
+  fi
+  quorum="no"

 fi
 fi
 
 fi
 fi
 


@@ -3008,6 +3079,33 @@ EOF
   fi
 fi
 
   fi
 fi
 

+
+##########################################
+# archipelago probe
+if test "$archipelago" != "no" ; then
+    cat > $TMPC <<EOF
+#include <stdio.h>
+#include <xseg/xseg.h>
+#include <xseg/protocol.h>
+int main(void) {
+    xseg_initialize();
+    return 0;
+}
+EOF
+    archipelago_libs=-lxseg
+    if compile_prog "" "$archipelago_libs"; then
+        archipelago="yes"
+        libs_tools="$archipelago_libs $libs_tools"
+        libs_softmmu="$archipelago_libs $libs_softmmu"
+    else
+      if test "$archipelago" = "yes" ; then
+        feature_not_found "Archipelago backend support" "Install libxseg devel"
+      fi
+      archipelago="no"
+    fi
+fi
+
+

 ##########################################
 # glusterfs probe
 if test "$glusterfs" != "no" ; then
 ##########################################
 # glusterfs probe
 if test "$glusterfs" != "no" ; then


@@ -3023,7 +3121,8 @@ if test "$glusterfs" != "no" ; then
     fi
   else
     if test "$glusterfs" = "yes" ; then
     fi
   else
     if test "$glusterfs" = "yes" ; then

-      feature_not_found "GlusterFS backend support" "Install glusterfs-api devel"
+      feature_not_found "GlusterFS backend support" \
+          "Install glusterfs-api devel >= 3"

     fi
     glusterfs="no"
   fi
     fi
     glusterfs="no"
   fi


@@ -3134,6 +3233,26 @@ if compile_prog "" "" ; then
   splice=yes
 fi
 
   splice=yes
 fi
 

+##########################################
+# libnuma probe
+
+if test "$numa" != "no" ; then
+  cat > $TMPC << EOF
+#include <numa.h>
+int main(void) { return numa_available(); }
+EOF
+
+  if compile_prog "" "-lnuma" ; then
+    numa=yes
+    libs_softmmu="-lnuma $libs_softmmu"
+  else
+    if test "$numa" = "yes" ; then
+      feature_not_found "numa" "install numactl devel"
+    fi
+    numa=no
+  fi
+fi
+

 ##########################################
 # signalfd probe
 signalfd="no"
 ##########################################
 # signalfd probe
 signalfd="no"


@@ -3337,6 +3456,37 @@ if compile_prog "" "" ; then
   sendfile=yes
 fi
 
   sendfile=yes
 fi
 

+# check for timerfd support (glibc 2.8 and newer)
+timerfd=no
+cat > $TMPC << EOF
+#include <sys/timerfd.h>
+
+int main(void)
+{
+    return(timerfd_create(CLOCK_REALTIME, 0));
+}
+EOF
+if compile_prog "" "" ; then
+  timerfd=yes
+fi
+
+# check for setns and unshare support
+setns=no
+cat > $TMPC << EOF
+#include <sched.h>
+
+int main(void)
+{
+    int ret;
+    ret = setns(0, 0);
+    ret = unshare(0);
+    return ret;
+}
+EOF
+if compile_prog "" "" ; then
+  setns=yes
+fi
+

 # Check if tools are available to build documentation.
 if test "$docs" != "no" ; then
   if has makeinfo && has pod2man; then
 # Check if tools are available to build documentation.
 if test "$docs" != "no" ; then
   if has makeinfo && has pod2man; then


@@ -3372,51 +3522,25 @@ if compile_prog "" "" ; then
 fi
 
 ##########################################
 fi
 
 ##########################################

-# Do we have libiscsi
-# We check for iscsi_write16_sync() to make sure we have a
-# at least version 1.4.0 of libiscsi.
+# Do we have libiscsi >= 1.9.0

 if test "$libiscsi" != "no" ; then
 if test "$libiscsi" != "no" ; then

-  cat > $TMPC << EOF
-#include <stdio.h>
-#include <iscsi/iscsi.h>
-int main(void) { iscsi_write16_sync(NULL,0,0,NULL,0,0,0,0,0,0,0); return 0; }
-EOF
-  if $pkg_config --atleast-version=1.7.0 libiscsi; then
+  if $pkg_config --atleast-version=1.9.0 libiscsi; then

     libiscsi="yes"
     libiscsi_cflags=$($pkg_config --cflags libiscsi)
     libiscsi_libs=$($pkg_config --libs libiscsi)
     libiscsi="yes"
     libiscsi_cflags=$($pkg_config --cflags libiscsi)
     libiscsi_libs=$($pkg_config --libs libiscsi)

-  elif compile_prog "" "-liscsi" ; then
-    libiscsi="yes"
-    libiscsi_libs="-liscsi"

   else
     if test "$libiscsi" = "yes" ; then
   else
     if test "$libiscsi" = "yes" ; then

-      feature_not_found "libiscsi" "Install libiscsi devel"
+      feature_not_found "libiscsi" "Install libiscsi >= 1.9.0"

     fi
     libiscsi="no"
   fi
 fi
 
     fi
     libiscsi="no"
   fi
 fi
 

-# We also need to know the API version because there was an
-# API change from 1.4.0 to 1.5.0.
-if test "$libiscsi" = "yes"; then
-  cat >$TMPC <<EOF
-#include <iscsi/iscsi.h>
-int main(void)
-{
-  iscsi_read10_task(0, 0, 0, 0, 0, 0, 0);
-  return 0;
-}
-EOF
-  if compile_prog "" "-liscsi"; then
-    libiscsi_version="1.4.0"
-  fi
-fi
-

 ##########################################
 # Do we need libm
 cat > $TMPC << EOF
 #include <math.h>
 ##########################################
 # Do we need libm
 cat > $TMPC << EOF
 #include <math.h>

-int main(void) { return isnan(sin(0.0)); }
+int main(int argc, char **argv) { return isnan(sin((double)argc)); }

 EOF
 if compile_prog "" "" ; then
   :
 EOF
 if compile_prog "" "" ; then
   :


@@ -3445,9 +3569,9 @@ EOF
 if compile_prog "" "" ; then
   :
 # we need pthread for static linking. use previous pthread test result
 if compile_prog "" "" ; then
   :
 # we need pthread for static linking. use previous pthread test result

-elif compile_prog "" "-lrt $pthread_lib" ; then
-  LIBS="-lrt $LIBS"
-  libs_qga="-lrt $libs_qga"
+elif compile_prog "" "$pthread_lib -lrt" ; then
+  LIBS="$LIBS -lrt"
+  libs_qga="$libs_qga -lrt"

 fi
 
 if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
 fi
 
 if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \


@@ -3474,7 +3598,8 @@ EOF
     spice_server_version=$($pkg_config --modversion spice-server)
   else
     if test "$spice" = "yes" ; then
     spice_server_version=$($pkg_config --modversion spice-server)
   else
     if test "$spice" = "yes" ; then

-      feature_not_found "spice" "Install spice-server and spice-protocol devel"
+      feature_not_found "spice" \
+          "Install spice-server(>=0.12.0) and spice-protocol(>=0.12.3) devel"

     fi
     spice="no"
   fi
     fi
     spice="no"
   fi


@@ -3505,7 +3630,7 @@ EOF
         smartcard_nss="yes"
     else
         if test "$smartcard_nss" = "yes"; then
         smartcard_nss="yes"
     else
         if test "$smartcard_nss" = "yes"; then

-            feature_not_found "nss"
+            feature_not_found "nss" "Install nss devel >= 3.12.8"

         fi
         smartcard_nss="no"
     fi
         fi
         smartcard_nss="no"
     fi


@@ -3521,7 +3646,7 @@ if test "$libusb" != "no" ; then
         libs_softmmu="$libs_softmmu $libusb_libs"
     else
         if test "$libusb" = "yes"; then
         libs_softmmu="$libs_softmmu $libusb_libs"
     else
         if test "$libusb" = "yes"; then

-            feature_not_found "libusb" "Install libusb devel"
+            feature_not_found "libusb" "Install libusb devel >= 1.0.13"

         fi
         libusb="no"
     fi
         fi
         libusb="no"
     fi


@@ -3666,15 +3791,15 @@ fi
 ##########################################
 # check if trace backend exists
 
 ##########################################
 # check if trace backend exists
 

-$python "$source_path/scripts/tracetool.py" "--backend=$trace_backend" --check-backend  > /dev/null 2> /dev/null
+$python "$source_path/scripts/tracetool.py" "--backends=$trace_backends" --check-backends  > /dev/null 2> /dev/null

 if test "$?" -ne 0 ; then
 if test "$?" -ne 0 ; then

-  error_exit "invalid trace backend" \
-      "Please choose a supported trace backend."
+  error_exit "invalid trace backends" \
+      "Please choose supported trace backends."

 fi
 
 ##########################################
 # For 'ust' backend, test if ust headers are present
 fi
 
 ##########################################
 # For 'ust' backend, test if ust headers are present

-if test "$trace_backend" = "ust"; then
+if have_backend "ust"; then

   cat > $TMPC << EOF
 #include <lttng/tracepoint.h>
 int main(void) { return 0; }
   cat > $TMPC << EOF
 #include <lttng/tracepoint.h>
 int main(void) { return 0; }


@@ -3700,7 +3825,7 @@ fi
 
 ##########################################
 # For 'dtrace' backend, test if 'dtrace' command is present
 
 ##########################################
 # For 'dtrace' backend, test if 'dtrace' command is present

-if test "$trace_backend" = "dtrace"; then
+if have_backend "dtrace"; then

   if ! has 'dtrace' ; then
     error_exit "dtrace command is not found in PATH $PATH"
   fi
   if ! has 'dtrace' ; then
     error_exit "dtrace command is not found in PATH $PATH"
   fi


@@ -3946,7 +4071,7 @@ if test "$libnfs" != "no" ; then
     LIBS="$LIBS $libnfs_libs"
   else
     if test "$libnfs" = "yes" ; then
     LIBS="$LIBS $libnfs_libs"
   else
     if test "$libnfs" = "yes" ; then

-      feature_not_found "libnfs"
+      feature_not_found "libnfs" "Install libnfs devel >= 1.9.3"

     fi
     libnfs="no"
   fi
     fi
     libnfs="no"
   fi


@@ -4170,7 +4295,7 @@ echo "uuid support      $uuid"
 echo "libcap-ng support $cap_ng"
 echo "vhost-net support $vhost_net"
 echo "vhost-scsi support $vhost_scsi"
 echo "libcap-ng support $cap_ng"
 echo "vhost-net support $vhost_net"
 echo "vhost-scsi support $vhost_scsi"

-echo "Trace backend     $trace_backend"
+echo "Trace backends    $trace_backends"

 if test "$trace_backend" = "simple"; then
 echo "Trace output file $trace_file-<pid>"
 fi
 if test "$trace_backend" = "simple"; then
 echo "Trace output file $trace_file-<pid>"
 fi


@@ -4185,11 +4310,7 @@ echo "nss used          $smartcard_nss"
 echo "libusb            $libusb"
 echo "usb net redir     $usb_redir"
 echo "GLX support       $glx"
 echo "libusb            $libusb"
 echo "usb net redir     $usb_redir"
 echo "GLX support       $glx"

-if test "$libiscsi_version" = "1.4.0"; then
-echo "libiscsi support  $libiscsi (1.4.0)"
-else

 echo "libiscsi support  $libiscsi"
 echo "libiscsi support  $libiscsi"

-fi

 echo "libnfs support    $libnfs"
 echo "build guest agent $guest_agent"
 echo "QGA VSS support   $guest_agent_with_vss"
 echo "libnfs support    $libnfs"
 echo "build guest agent $guest_agent"
 echo "QGA VSS support   $guest_agent_with_vss"


@@ -4197,6 +4318,7 @@ echo "seccomp support   $seccomp"
 echo "coroutine backend $coroutine"
 echo "coroutine pool    $coroutine_pool"
 echo "GlusterFS support $glusterfs"
 echo "coroutine backend $coroutine"
 echo "coroutine pool    $coroutine_pool"
 echo "GlusterFS support $glusterfs"

+echo "Archipelago support $archipelago"

 echo "virtio-blk-data-plane $virtio_blk_data_plane"
 echo "gcov              $gcov_tool"
 echo "gcov enabled      $gcov"
 echo "virtio-blk-data-plane $virtio_blk_data_plane"
 echo "gcov              $gcov_tool"
 echo "gcov enabled      $gcov"


@@ -4208,6 +4330,7 @@ echo "vhdx              $vhdx"
 echo "Quorum            $quorum"
 echo "lzo support       $lzo"
 echo "snappy support    $snappy"
 echo "Quorum            $quorum"
 echo "lzo support       $lzo"
 echo "snappy support    $snappy"

+echo "NUMA host support $numa"

 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"


@@ -4309,6 +4432,9 @@ fi
 if test "$netmap" = "yes" ; then
   echo "CONFIG_NETMAP=y" >> $config_host_mak
 fi
 if test "$netmap" = "yes" ; then
   echo "CONFIG_NETMAP=y" >> $config_host_mak
 fi

+if test "$l2tpv3" = "yes" ; then
+  echo "CONFIG_L2TPV3=y" >> $config_host_mak
+fi

 if test "$cap_ng" = "yes" ; then
   echo "CONFIG_LIBCAP=y" >> $config_host_mak
 fi
 if test "$cap_ng" = "yes" ; then
   echo "CONFIG_LIBCAP=y" >> $config_host_mak
 fi


@@ -4429,6 +4555,12 @@ fi
 if test "$sendfile" = "yes" ; then
   echo "CONFIG_SENDFILE=y" >> $config_host_mak
 fi
 if test "$sendfile" = "yes" ; then
   echo "CONFIG_SENDFILE=y" >> $config_host_mak
 fi

+if test "$timerfd" = "yes" ; then
+  echo "CONFIG_TIMERFD=y" >> $config_host_mak
+fi
+if test "$setns" = "yes" ; then
+  echo "CONFIG_SETNS=y" >> $config_host_mak
+fi

 if test "$inotify" = "yes" ; then
   echo "CONFIG_INOTIFY=y" >> $config_host_mak
 fi
 if test "$inotify" = "yes" ; then
   echo "CONFIG_INOTIFY=y" >> $config_host_mak
 fi


@@ -4482,6 +4614,9 @@ fi
 if test "$vhost_scsi" = "yes" ; then
   echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
 fi
 if test "$vhost_scsi" = "yes" ; then
   echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
 fi

+if test "$vhost_net" = "yes" ; then
+  echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak
+fi

 if test "$blobs" = "yes" ; then
   echo "INSTALL_BLOBS=yes" >> $config_host_mak
 fi
 if test "$blobs" = "yes" ; then
   echo "INSTALL_BLOBS=yes" >> $config_host_mak
 fi


@@ -4546,9 +4681,6 @@ fi
 
 if test "$libiscsi" = "yes" ; then
   echo "CONFIG_LIBISCSI=m" >> $config_host_mak
 
 if test "$libiscsi" = "yes" ; then
   echo "CONFIG_LIBISCSI=m" >> $config_host_mak

-  if test "$libiscsi_version" = "1.4.0"; then
-    echo "CONFIG_LIBISCSI_1_4=y" >> $config_host_mak
-  fi

   echo "LIBISCSI_CFLAGS=$libiscsi_cflags" >> $config_host_mak
   echo "LIBISCSI_LIBS=$libiscsi_libs" >> $config_host_mak
 fi
   echo "LIBISCSI_CFLAGS=$libiscsi_cflags" >> $config_host_mak
   echo "LIBISCSI_LIBS=$libiscsi_libs" >> $config_host_mak
 fi


@@ -4631,6 +4763,11 @@ if test "$glusterfs_zerofill" = "yes" ; then
   echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak
 fi
 
   echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak
 fi
 

+if test "$archipelago" = "yes" ; then
+  echo "CONFIG_ARCHIPELAGO=m" >> $config_host_mak
+  echo "ARCHIPELAGO_LIBS=$archipelago_libs" >> $config_host_mak
+fi
+

 if test "$libssh2" = "yes" ; then
   echo "CONFIG_LIBSSH2=m" >> $config_host_mak
   echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak
 if test "$libssh2" = "yes" ; then
   echo "CONFIG_LIBSSH2=m" >> $config_host_mak
   echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak


@@ -4664,43 +4801,35 @@ if test "$tpm" = "yes"; then
   fi
 fi
 
   fi
 fi
 

-# use default implementation for tracing backend-specific routines
-trace_default=yes
-echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak
-if test "$trace_backend" = "nop"; then
+echo "TRACE_BACKENDS=$trace_backends" >> $config_host_mak
+if have_backend "nop"; then

   echo "CONFIG_TRACE_NOP=y" >> $config_host_mak
 fi
   echo "CONFIG_TRACE_NOP=y" >> $config_host_mak
 fi

-if test "$trace_backend" = "simple"; then
+if have_backend "simple"; then

   echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak
   echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak

-  trace_default=no

   # Set the appropriate trace file.
   trace_file="\"$trace_file-\" FMT_pid"
 fi
   # Set the appropriate trace file.
   trace_file="\"$trace_file-\" FMT_pid"
 fi

-if test "$trace_backend" = "stderr"; then
+if have_backend "stderr"; then

   echo "CONFIG_TRACE_STDERR=y" >> $config_host_mak
   echo "CONFIG_TRACE_STDERR=y" >> $config_host_mak

-  trace_default=no

 fi
 fi

-if test "$trace_backend" = "ust"; then
+if have_backend "ust"; then

   echo "CONFIG_TRACE_UST=y" >> $config_host_mak
 fi
   echo "CONFIG_TRACE_UST=y" >> $config_host_mak
 fi

-if test "$trace_backend" = "dtrace"; then
+if have_backend "dtrace"; then

   echo "CONFIG_TRACE_DTRACE=y" >> $config_host_mak
   if test "$trace_backend_stap" = "yes" ; then
     echo "CONFIG_TRACE_SYSTEMTAP=y" >> $config_host_mak
   fi
 fi
   echo "CONFIG_TRACE_DTRACE=y" >> $config_host_mak
   if test "$trace_backend_stap" = "yes" ; then
     echo "CONFIG_TRACE_SYSTEMTAP=y" >> $config_host_mak
   fi
 fi

-if test "$trace_backend" = "ftrace"; then
+if have_backend "ftrace"; then

   if test "$linux" = "yes" ; then
     echo "CONFIG_TRACE_FTRACE=y" >> $config_host_mak
   if test "$linux" = "yes" ; then
     echo "CONFIG_TRACE_FTRACE=y" >> $config_host_mak

-    trace_default=no

   else
     feature_not_found "ftrace(trace backend)" "ftrace requires Linux"
   fi
 fi
 echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak
   else
     feature_not_found "ftrace(trace backend)" "ftrace requires Linux"
   fi
 fi
 echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak

-if test "$trace_default" = "yes"; then
-  echo "CONFIG_TRACE_DEFAULT=y" >> $config_host_mak
-fi

 
 if test "$rdma" = "yes" ; then
   echo "CONFIG_RDMA=y" >> $config_host_mak
 
 if test "$rdma" = "yes" ; then
   echo "CONFIG_RDMA=y" >> $config_host_mak


@@ -4724,6 +4853,8 @@ elif test "$ARCH" = "s390x" ; then
   QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES"
 elif test "$ARCH" = "x86_64" -o "$ARCH" = "x32" ; then
   QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES"
   QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES"
 elif test "$ARCH" = "x86_64" -o "$ARCH" = "x32" ; then
   QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES"

+elif test "$ARCH" = "ppc64" ; then
+  QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES"

 else
   QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
 fi
 else
   QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
 fi


@@ -4805,6 +4936,9 @@ if test "$linux" = "yes" ; then
   aarch64)
     linux_arch=arm64
     ;;
   aarch64)
     linux_arch=arm64
     ;;

+  mips64)
+    linux_arch=mips
+    ;;

   *)
     # For most CPUs the kernel architecture name and QEMU CPU name match.
     linux_arch="$cpu"
   *)
     # For most CPUs the kernel architecture name and QEMU CPU name match.
     linux_arch="$cpu"


@@ -4911,6 +5045,8 @@ case "$target_name" in
     TARGET_BASE_ARCH=mips
     echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
   ;;
     TARGET_BASE_ARCH=mips
     echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
   ;;

+  tricore)
+  ;;

   moxie)
   ;;
   or32)
   moxie)
   ;;
   or32)


@@ -4930,6 +5066,12 @@ case "$target_name" in
     TARGET_ABI_DIR=ppc
     gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
   ;;
     TARGET_ABI_DIR=ppc
     gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
   ;;

+  ppc64le)
+    TARGET_ARCH=ppc64
+    TARGET_BASE_ARCH=ppc
+    TARGET_ABI_DIR=ppc
+    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
+  ;;

   ppc64abi32)
     TARGET_ARCH=ppc64
     TARGET_BASE_ARCH=ppc
   ppc64abi32)
     TARGET_ARCH=ppc64
     TARGET_BASE_ARCH=ppc


@@ -4953,6 +5095,7 @@ case "$target_name" in
     echo "TARGET_ABI32=y" >> $config_target_mak
   ;;
   s390x)
     echo "TARGET_ABI32=y" >> $config_target_mak
   ;;
   s390x)

+    gdb_xml_files="s390x-core64.xml s390-acr.xml s390-fpr.xml"

   ;;
   unicore32)
   ;;
   ;;
   unicore32)
   ;;


@@ -4982,6 +5125,9 @@ if [ "$TARGET_ABI_DIR" = "" ]; then
   TARGET_ABI_DIR=$TARGET_ARCH
 fi
 echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak
   TARGET_ABI_DIR=$TARGET_ARCH
 fi
 echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak

+if [ "$HOST_VARIANT_DIR" != "" ]; then
+    echo "HOST_VARIANT_DIR=$HOST_VARIANT_DIR" >> $config_target_mak
+fi

 case "$target_name" in
   i386|x86_64)
     if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
 case "$target_name" in
   i386|x86_64)
     if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then


@@ -4994,7 +5140,7 @@ case "$target_name" in
   *)
 esac
 case "$target_name" in
   *)
 esac
 case "$target_name" in

-  aarch64|arm|i386|x86_64|ppcemb|ppc|ppc64|s390x)
+  aarch64|arm|i386|x86_64|ppcemb|ppc|ppc64|s390x|mipsel|mips)

     # Make sure the target and host cpus are compatible
     if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \
       \( "$target_name" = "$cpu" -o \
     # Make sure the target and host cpus are compatible
     if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \
       \( "$target_name" = "$cpu" -o \


@@ -5002,6 +5148,7 @@ case "$target_name" in
       \( "$target_name" = "ppc64"  -a "$cpu" = "ppc" \) -o \
       \( "$target_name" = "ppc"    -a "$cpu" = "ppc64" \) -o \
       \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \
       \( "$target_name" = "ppc64"  -a "$cpu" = "ppc" \) -o \
       \( "$target_name" = "ppc"    -a "$cpu" = "ppc64" \) -o \
       \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \

+      \( "$target_name" = "mipsel" -a "$cpu" = "mips" \) -o \

       \( "$target_name" = "x86_64" -a "$cpu" = "i386"   \) -o \
       \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_target_mak
       \( "$target_name" = "x86_64" -a "$cpu" = "i386"   \) -o \
       \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_target_mak


@@ -5173,6 +5320,10 @@ if [ "$dtc_internal" = "yes" ]; then
   echo "config-host.h: subdir-dtc" >> $config_host_mak
 fi
 
   echo "config-host.h: subdir-dtc" >> $config_host_mak
 fi
 

+if test "$numa" = "yes"; then
+  echo "CONFIG_NUMA=y" >> $config_host_mak
+fi
+

 # build tree in object directory in case the source is not in the current directory
 DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests"
 DIRS="$DIRS fsdev"
 # build tree in object directory in case the source is not in the current directory
 DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests"
 DIRS="$DIRS fsdev"


@@ -5194,6 +5345,7 @@ for bios_file in \
     $source_path/pc-bios/*.dtb \
     $source_path/pc-bios/*.img \
     $source_path/pc-bios/openbios-* \
     $source_path/pc-bios/*.dtb \
     $source_path/pc-bios/*.img \
     $source_path/pc-bios/openbios-* \

+    $source_path/pc-bios/u-boot.* \

     $source_path/pc-bios/palcode-*
 do
     FILES="$FILES pc-bios/`basename $bios_file`"
     $source_path/pc-bios/palcode-*
 do
     FILES="$FILES pc-bios/`basename $bios_file`"


@@ -5223,8 +5375,16 @@ for rom in seabios vgabios ; do
     echo "LD=$ld" >> $config_mak
 done
 
     echo "LD=$ld" >> $config_mak
 done
 

-if test "$docs" = "yes" ; then
-  mkdir -p QMP
+# set up qemu-iotests in this build directory
+iotests_common_env="tests/qemu-iotests/common.env"
+iotests_check="tests/qemu-iotests/check"
+
+echo "# Automatically generated by configure - do not modify" > "$iotests_common_env"
+echo >> "$iotests_common_env"
+echo "export PYTHON='$python'" >> "$iotests_common_env"
+
+if [ ! -e "$iotests_check" ]; then
+    symlink "$source_path/$iotests_check" "$iotests_check"

 fi
 
 # Save the configure command line for later reuse.
 fi
 
 # Save the configure command line for later reuse.