PPC: Bump qemu-system-ppc to 64-bit physical address space

[qemu.git] / configure

diff --git a/configure b/configure
index 1cc376703c4dcf62d7338246218372d4a0af78af..f8dd4db6c57cb18a1ab1f1326970c454dce88f0a 100755 (executable)
--- a/configure
+++ b/configure
@@ -92,6 +92,7 @@ libs_tools=""
 audio_pt_int=""
 audio_win_int=""
 cc_i386=i386-pc-linux-gnu-gcc
 audio_pt_int=""
 audio_win_int=""
 cc_i386=i386-pc-linux-gnu-gcc

+libs_qga=""

 
 target_list=""
 
 
 target_list=""
 


@@ -113,7 +114,6 @@ curl=""
 curses=""
 docs=""
 fdt=""
 curses=""
 docs=""
 fdt=""

-kvm=""

 nptl=""
 sdl=""
 vnc="yes"
 nptl=""
 sdl=""
 vnc="yes"


@@ -129,9 +129,10 @@ xen=""
 xen_ctrl_version=""
 linux_aio=""
 attr=""
 xen_ctrl_version=""
 linux_aio=""
 attr=""

-vhost_net=""

 xfs=""
 
 xfs=""
 

+vhost_net="no"
+kvm="no"

 gprof="no"
 debug_tcg="no"
 debug_mon="no"
 gprof="no"
 debug_tcg="no"
 debug_mon="no"


@@ -164,7 +165,6 @@ darwin_user="no"
 bsd_user="no"
 guest_base=""
 uname_release=""
 bsd_user="no"
 guest_base=""
 uname_release=""

-io_thread="no"

 mixemu="no"
 aix="no"
 blobs="yes"
 mixemu="no"
 aix="no"
 blobs="yes"


@@ -178,7 +178,10 @@ spice=""
 rbd=""
 smartcard=""
 smartcard_nss=""
 rbd=""
 smartcard=""
 smartcard_nss=""

+usb_redir=""

 opengl=""
 opengl=""

+zlib="yes"
+guest_agent="yes"

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


@@ -217,14 +220,15 @@ done
 # Using uname is really, really broken.  Once we have the right set of checks
 # we can eliminate it's usage altogether
 
 # Using uname is really, really broken.  Once we have the right set of checks
 # we can eliminate it's usage altogether
 

-cc="${cross_prefix}${CC-gcc}"
-ar="${cross_prefix}${AR-ar}"
-objcopy="${cross_prefix}${OBJCOPY-objcopy}"
-ld="${cross_prefix}${LD-ld}"
-strip="${cross_prefix}${STRIP-strip}"
-windres="${cross_prefix}${WINDRES-windres}"
-pkg_config="${cross_prefix}${PKG_CONFIG-pkg-config}"
-sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}"
+cc="${CC-${cross_prefix}gcc}"
+ar="${AR-${cross_prefix}ar}"
+objcopy="${OBJCOPY-${cross_prefix}objcopy}"
+ld="${LD-${cross_prefix}ld}"
+libtool="${LIBTOOL-${cross_prefix}libtool}"
+strip="${STRIP-${cross_prefix}strip}"
+windres="${WINDRES-${cross_prefix}windres}"
+pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
+sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"

 
 # default flags for all hosts
 QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
 
 # default flags for all hosts
 QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"


@@ -233,7 +237,7 @@ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
 QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
 QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
 QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
 QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
 QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
 QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"

-QEMU_INCLUDES="-I. -I\$(SRC_PATH)"
+QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"

 LDFLAGS="-g $LDFLAGS"
 
 # make source path absolute
 LDFLAGS="-g $LDFLAGS"
 
 # make source path absolute


@@ -280,6 +284,12 @@ elif check_define __s390__ ; then
   else
     cpu="s390"
   fi
   else
     cpu="s390"
   fi

+elif check_define __ARMEB__ ; then
+  cpu="armv4b"
+elif check_define __ARMEL__ ; then
+  cpu="armv4l"
+elif check_define __hppa__ ; then
+  cpu="hppa"

 else
   cpu=`uname -m`
 fi
 else
   cpu=`uname -m`
 fi


@@ -300,7 +310,7 @@ case "$cpu" in
   armv*l)
     cpu="armv4l"
   ;;
   armv*l)
     cpu="armv4l"
   ;;

-  parisc|parisc64)
+  hppa|parisc|parisc64)

     cpu="hppa"
   ;;
   mips*)
     cpu="hppa"
   ;;
   mips*)


@@ -408,6 +418,7 @@ SunOS)
   make="${MAKE-gmake}"
   install="${INSTALL-ginstall}"
   ld="gld"
   make="${MAKE-gmake}"
   install="${INSTALL-ginstall}"
   ld="gld"

+  smbd="${SMBD-/usr/sfw/sbin/smbd}"

   needs_libsunmath="no"
   solarisrev=`uname -r | cut -f2 -d.`
   # have to select again, because `uname -m` returns i86pc
   needs_libsunmath="no"
   solarisrev=`uname -r | cut -f2 -d.`
   # have to select again, because `uname -m` returns i86pc


@@ -475,6 +486,8 @@ fi
 
 : ${make=${MAKE-make}}
 : ${install=${INSTALL-install}}
 
 : ${make=${MAKE-make}}
 : ${install=${INSTALL-install}}

+: ${python=${PYTHON-python}}
+: ${smbd=${SMBD-/usr/sbin/smbd}}

 
 if test "$mingw32" = "yes" ; then
   EXESUF=".exe"
 
 if test "$mingw32" = "yes" ; then
   EXESUF=".exe"


@@ -489,6 +502,7 @@ if test "$mingw32" = "yes" ; then
   bindir="\${prefix}"
   sysconfdir="\${prefix}"
   confsuffix=""
   bindir="\${prefix}"
   sysconfdir="\${prefix}"
   confsuffix=""

+  guest_agent="no"

 fi
 
 werror=""
 fi
 
 werror=""


@@ -516,6 +530,10 @@ for opt do
   ;;
   --install=*) install="$optarg"
   ;;
   ;;
   --install=*) install="$optarg"
   ;;

+  --python=*) python="$optarg"
+  ;;
+  --smbd=*) smbd="$optarg"
+  ;;

   --extra-cflags=*)
   ;;
   --extra-ldflags=*)
   --extra-cflags=*)
   ;;
   --extra-ldflags=*)


@@ -714,8 +732,6 @@ for opt do
   ;;
   --enable-attr) attr="yes"
   ;;
   ;;
   --enable-attr) attr="yes"
   ;;

-  --enable-io-thread) io_thread="yes"
-  ;;

   --disable-blobs) blobs="no"
   ;;
   --with-pkgversion=*) pkgversion=" ($optarg)"
   --disable-blobs) blobs="no"
   ;;
   --with-pkgversion=*) pkgversion=" ($optarg)"


@@ -746,6 +762,16 @@ for opt do
   ;;
   --enable-smartcard-nss) smartcard_nss="yes"
   ;;
   ;;
   --enable-smartcard-nss) smartcard_nss="yes"
   ;;

+  --disable-usb-redir) usb_redir="no"
+  ;;
+  --enable-usb-redir) usb_redir="yes"
+  ;;
+  --disable-zlib-test) zlib="no"
+  ;;
+  --enable-guest-agent) guest_agent="yes"
+  ;;
+  --disable-guest-agent) guest_agent="no"
+  ;;

   *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;
   esac
   *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;
   esac


@@ -854,6 +880,8 @@ sh4eb-softmmu \
 sparc-softmmu \
 sparc64-softmmu \
 s390x-softmmu \
 sparc-softmmu \
 sparc64-softmmu \
 s390x-softmmu \

+xtensa-softmmu \
+xtensaeb-softmmu \

 "
 fi
 # the following are Linux specific
 "
 fi
 # the following are Linux specific


@@ -922,6 +950,8 @@ echo "  --extra-cflags=CFLAGS    append extra C compiler flags QEMU_CFLAGS"
 echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"
 echo "  --make=MAKE              use specified make [$make]"
 echo "  --install=INSTALL        use specified install [$install]"
 echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"
 echo "  --make=MAKE              use specified make [$make]"
 echo "  --install=INSTALL        use specified install [$install]"

+echo "  --python=PYTHON          use specified python [$python]"
+echo "  --smbd=SMBD              use specified smbd [$smbd]"

 echo "  --static                 enable static build [$static]"
 echo "  --mandir=PATH            install man pages in PATH"
 echo "  --datadir=PATH           install firmware in PATH"
 echo "  --static                 enable static build [$static]"
 echo "  --mandir=PATH            install man pages in PATH"
 echo "  --datadir=PATH           install firmware in PATH"


@@ -1004,7 +1034,6 @@ echo "  --disable-linux-aio      disable Linux AIO support"
 echo "  --enable-linux-aio       enable Linux AIO support"
 echo "  --disable-attr           disables attr and xattr support"
 echo "  --enable-attr            enable attr and xattr support"
 echo "  --enable-linux-aio       enable Linux AIO support"
 echo "  --disable-attr           disables attr and xattr support"
 echo "  --enable-attr            enable attr and xattr support"

-echo "  --enable-io-thread       enable IO thread"

 echo "  --disable-blobs          disable installing provided firmware blobs"
 echo "  --enable-docs            enable documentation build"
 echo "  --disable-docs           disable documentation build"
 echo "  --disable-blobs          disable installing provided firmware blobs"
 echo "  --enable-docs            enable documentation build"
 echo "  --disable-docs           disable documentation build"


@@ -1021,6 +1050,10 @@ echo "  --disable-smartcard      disable smartcard support"
 echo "  --enable-smartcard       enable smartcard support"
 echo "  --disable-smartcard-nss  disable smartcard nss support"
 echo "  --enable-smartcard-nss   enable smartcard nss support"
 echo "  --enable-smartcard       enable smartcard support"
 echo "  --disable-smartcard-nss  disable smartcard nss support"
 echo "  --enable-smartcard-nss   enable smartcard nss support"

+echo "  --disable-usb-redir      disable usb network redirection support"
+echo "  --enable-usb-redir       enable usb network redirection support"
+echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"
+echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"

 echo ""
 echo "NOTE: The object files are built at the place where configure is launched"
 exit 1
 echo ""
 echo "NOTE: The object files are built at the place where configure is launched"
 exit 1


@@ -1046,7 +1079,7 @@ cat > $TMPC << EOF
 int main(void) { return 0; }
 EOF
 for flag in $gcc_flags; do
 int main(void) { return 0; }
 EOF
 for flag in $gcc_flags; do

-    if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
+    if compile_prog "$flag -Werror" "" ; then

        QEMU_CFLAGS="$QEMU_CFLAGS $flag"
     fi
 done
        QEMU_CFLAGS="$QEMU_CFLAGS $flag"
     fi
 done


@@ -1080,6 +1113,15 @@ if test "$solaris" = "yes" ; then
   fi
 fi
 
   fi
 fi
 

+if test "$guest_agent" != "no" ; then
+  if has $python; then
+    :
+  else
+    echo "Python not found. Use --python=/path/to/python"
+    exit 1
+  fi
+fi
+

 if test -z "$target_list" ; then
     target_list="$default_target_list"
 else
 if test -z "$target_list" ; then
     target_list="$default_target_list"
 else


@@ -1175,18 +1217,20 @@ fi
 ##########################################
 # zlib check
 
 ##########################################
 # zlib check
 

-cat > $TMPC << EOF
+if test "$zlib" != "no" ; then
+    cat > $TMPC << EOF

 #include <zlib.h>
 int main(void) { zlibVersion(); return 0; }
 EOF
 #include <zlib.h>
 int main(void) { zlibVersion(); return 0; }
 EOF

-if compile_prog "" "-lz" ; then
-    :
-else
-    echo
-    echo "Error: zlib check failed"
-    echo "Make sure to have the zlib libs and headers installed."
-    echo
-    exit 1
+    if compile_prog "" "-lz" ; then
+        :
+    else
+        echo
+        echo "Error: zlib check failed"
+        echo "Make sure to have the zlib libs and headers installed."
+        echo
+        exit 1
+    fi

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


@@ -1302,17 +1346,15 @@ fi
 # pkg-config probe
 
 if ! has $pkg_config; then
 # pkg-config probe
 
 if ! has $pkg_config; then

-  echo warning: proceeding without "$pkg_config" >&2
-  pkg_config=/bin/false
+  echo "Error: pkg-config binary '$pkg_config' not found"
+  exit 1

 fi
 
 ##########################################
 # libtool probe
 
 fi
 
 ##########################################
 # libtool probe
 

-if ! has libtool; then
+if ! has $libtool; then

     libtool=
     libtool=

-else
-    libtool=libtool

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


@@ -1490,11 +1532,17 @@ int main(void) {
     return 0;
 }
 EOF
     return 0;
 }
 EOF

+  if $pkg_config libpng --modversion >/dev/null 2>&1; then
+    vnc_png_cflags=`$pkg_config libpng --cflags 2> /dev/null`
+    vnc_png_libs=`$pkg_config libpng --libs 2> /dev/null`
+  else

     vnc_png_cflags=""
     vnc_png_libs="-lpng"
     vnc_png_cflags=""
     vnc_png_libs="-lpng"

+  fi

   if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then
     vnc_png=yes
     libs_softmmu="$vnc_png_libs $libs_softmmu"
   if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then
     vnc_png=yes
     libs_softmmu="$vnc_png_libs $libs_softmmu"

+    QEMU_CFLAGS="$QEMU_CFLAGS $vnc_png_cflags"

   else
     if test "$vnc_png" = "yes" ; then
       feature_not_found "vnc-png"
   else
     if test "$vnc_png" = "yes" ; then
       feature_not_found "vnc-png"


@@ -1805,9 +1853,21 @@ EOF
   fi
 fi
 
   fi
 fi
 

+##########################################
+# glib support probe
+if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then
+    glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null`
+    glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null`
+    LIBS="$glib_libs $LIBS"
+    libs_qga="$glib_libs $libs_qga"
+else
+    echo "glib-2.0 required to compile QEMU"
+    exit 1
+fi
+

 ##########################################
 # pthread probe
 ##########################################
 # pthread probe

-PTHREADLIBS_LIST="-lpthread -lpthreadGC2"
+PTHREADLIBS_LIST="-pthread -lpthread -lpthreadGC2"

 
 pthread=no
 cat > $TMPC << EOF
 
 pthread=no
 cat > $TMPC << EOF


@@ -2108,12 +2168,6 @@ EOF
 
 if compile_prog "" "" ; then
   signalfd=yes
 
 if compile_prog "" "" ; then
   signalfd=yes

-elif test "$kvm" = "yes" -a "$io_thread" != "yes"; then
-  echo
-  echo "ERROR: Host kernel lacks signalfd() support,"
-  echo "but KVM depends on it when the IO thread is disabled."
-  echo
-  exit 1

 fi
 
 # check if eventfd is supported
 fi
 
 # check if eventfd is supported


@@ -2311,23 +2365,6 @@ if compile_prog "" "" ; then
     need_offsetof=no
 fi
 
     need_offsetof=no
 fi
 

-##########################################
-# check if the compiler understands attribute warn_unused_result
-#
-# This could be smarter, but gcc -Werror does not error out even when warning
-# about attribute warn_unused_result
-
-gcc_attribute_warn_unused_result=no
-cat > $TMPC << EOF
-#if defined(__GNUC__) && (__GNUC__ < 4) && defined(__GNUC_MINOR__) && (__GNUC__ < 4)
-#error gcc 3.3 or older
-#endif
-int main(void) { return 0;}
-EOF
-if compile_prog "" ""; then
-    gcc_attribute_warn_unused_result=yes
-fi
-

 # spice probe
 if test "$spice" != "no" ; then
   cat > $TMPC << EOF
 # spice probe
 if test "$spice" != "no" ; then
   cat > $TMPC << EOF


@@ -2374,6 +2411,22 @@ if test "$smartcard" = "no" ; then
     smartcard_nss="no"
 fi
 
     smartcard_nss="no"
 fi
 

+# check for usbredirparser for usb network redirection support
+if test "$usb_redir" != "no" ; then
+    if $pkg_config libusbredirparser >/dev/null 2>&1 ; then
+        usb_redir="yes"
+        usb_redir_cflags=$($pkg_config --cflags libusbredirparser 2>/dev/null)
+        usb_redir_libs=$($pkg_config --libs libusbredirparser 2>/dev/null)
+        QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"
+        LIBS="$LIBS $usb_redir_libs"
+    else
+        if test "$usb_redir" = "yes"; then
+            feature_not_found "usb-redir"
+        fi
+        usb_redir="no"
+    fi
+fi
+

 ##########################################
 
 ##########################################
 ##########################################
 
 ##########################################


@@ -2466,6 +2519,68 @@ if test "$trace_backend" = "dtrace"; then
   fi
 fi
 
   fi
 fi
 

+##########################################
+# __sync_fetch_and_and requires at least -march=i486. Many toolchains
+# use i686 as default anyway, but for those that don't, an explicit
+# specification is necessary
+if test "$vhost_net" = "yes" && test "$cpu" = "i386"; then
+  cat > $TMPC << EOF
+int sfaa(unsigned *ptr)
+{
+  return __sync_fetch_and_and(ptr, 0);
+}
+
+int main(int argc, char **argv)
+{
+  int val = 42;
+  sfaa(&val);
+  return val;
+}
+EOF
+  if ! compile_prog "" "" ; then
+    CFLAGS+="-march=i486"
+  fi
+fi
+
+##########################################
+# check if we have makecontext
+
+ucontext_coroutine=no
+if test "$darwin" != "yes"; then
+  cat > $TMPC << EOF
+#include <ucontext.h>
+int main(void) { makecontext(0, 0, 0); }
+EOF
+  if compile_prog "" "" ; then
+      ucontext_coroutine=yes
+  fi
+fi
+
+##########################################
+# check if we have open_by_handle_at
+
+open_by_hande_at=no
+cat > $TMPC << EOF
+#include <fcntl.h>
+int main(void) { struct file_handle *fh; open_by_handle_at(0, fh, 0); }
+EOF
+if compile_prog "" "" ; then
+    open_by_handle_at=yes
+fi
+
+########################################
+# check if we have linux/magic.h
+
+linux_magic_h=no
+cat > $TMPC << EOF
+#include <linux/magic.h>
+int main(void) {
+}
+EOF
+if compile_prog "" "" ; then
+    linux_magic_h=yes
+fi
+

 ##########################################
 # End of CC checks
 # After here, no more $cc or $ld runs
 ##########################################
 # End of CC checks
 # After here, no more $cc or $ld runs


@@ -2523,6 +2638,9 @@ if test "$softmmu" = yes ; then
   tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
   if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
       tools="qemu-nbd\$(EXESUF) $tools"
   tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
   if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
       tools="qemu-nbd\$(EXESUF) $tools"

+    if [ "$guest_agent" = "yes" ]; then
+      tools="qemu-ga\$(EXESUF) $tools"
+    fi

     if [ "$check_utests" = "yes" ]; then
       tools="check-qint check-qstring check-qdict check-qlist $tools"
       tools="check-qfloat check-qjson $tools"
     if [ "$check_utests" = "yes" ]; then
       tools="check-qint check-qstring check-qdict check-qlist $tools"
       tools="check-qfloat check-qjson $tools"


@@ -2559,6 +2677,10 @@ echo "QEMU_CFLAGS       $QEMU_CFLAGS"
 echo "LDFLAGS           $LDFLAGS"
 echo "make              $make"
 echo "install           $install"
 echo "LDFLAGS           $LDFLAGS"
 echo "make              $make"
 echo "install           $install"

+echo "python            $python"
+if test "$slirp" = "yes" ; then
+    echo "smbd              $smbd"
+fi

 echo "host CPU          $cpu"
 echo "host big endian   $bigendian"
 echo "target list       $target_list"
 echo "host CPU          $cpu"
 echo "host big endian   $bigendian"
 echo "target list       $target_list"


@@ -2603,7 +2725,6 @@ echo "NPTL support      $nptl"
 echo "GUEST_BASE        $guest_base"
 echo "PIE user targets  $user_pie"
 echo "vde support       $vde"
 echo "GUEST_BASE        $guest_base"
 echo "PIE user targets  $user_pie"
 echo "vde support       $vde"

-echo "IO thread         $io_thread"

 echo "Linux AIO support $linux_aio"
 echo "ATTR/XATTR support $attr"
 echo "Install blobs     $blobs"
 echo "Linux AIO support $linux_aio"
 echo "ATTR/XATTR support $attr"
 echo "Install blobs     $blobs"


@@ -2621,9 +2742,11 @@ echo "spice support     $spice"
 echo "rbd support       $rbd"
 echo "xfsctl support    $xfs"
 echo "nss used          $smartcard_nss"
 echo "rbd support       $rbd"
 echo "xfsctl support    $xfs"
 echo "nss used          $smartcard_nss"

+echo "usb net redir     $usb_redir"

 echo "OpenGL support    $opengl"
 echo "OpenGL support    $opengl"

+echo "build guest agent $guest_agent"

 
 

-if test $sdl_too_old = "yes"; then
+if test "$sdl_too_old" = "yes"; then

 echo "-> Your SDL version is too old - please upgrade to have SDL support"
 fi
 
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
 fi
 


@@ -2711,11 +2834,12 @@ fi
 if test "$static" = "yes" ; then
   echo "CONFIG_STATIC=y" >> $config_host_mak
 fi
 if test "$static" = "yes" ; then
   echo "CONFIG_STATIC=y" >> $config_host_mak
 fi

-if test $profiler = "yes" ; then
+if test "$profiler" = "yes" ; then

   echo "CONFIG_PROFILER=y" >> $config_host_mak
 fi
 if test "$slirp" = "yes" ; then
   echo "CONFIG_SLIRP=y" >> $config_host_mak
   echo "CONFIG_PROFILER=y" >> $config_host_mak
 fi
 if test "$slirp" = "yes" ; then
   echo "CONFIG_SLIRP=y" >> $config_host_mak

+  echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak

   QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES"
 fi
 if test "$vde" = "yes" ; then
   QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES"
 fi
 if test "$vde" = "yes" ; then


@@ -2854,13 +2978,11 @@ if test "$bluez" = "yes" ; then
   echo "CONFIG_BLUEZ=y" >> $config_host_mak
   echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
 fi
   echo "CONFIG_BLUEZ=y" >> $config_host_mak
   echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
 fi

+echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak

 if test "$xen" = "yes" ; then
   echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
   echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak
 fi
 if test "$xen" = "yes" ; then
   echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
   echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak
 fi

-if test "$io_thread" = "yes" ; then
-  echo "CONFIG_IOTHREAD=y" >> $config_host_mak
-fi

 if test "$linux_aio" = "yes" ; then
   echo "CONFIG_LINUX_AIO=y" >> $config_host_mak
 fi
 if test "$linux_aio" = "yes" ; then
   echo "CONFIG_LINUX_AIO=y" >> $config_host_mak
 fi


@@ -2890,9 +3012,6 @@ fi
 if test "$need_offsetof" = "yes" ; then
   echo "CONFIG_NEED_OFFSETOF=y" >> $config_host_mak
 fi
 if test "$need_offsetof" = "yes" ; then
   echo "CONFIG_NEED_OFFSETOF=y" >> $config_host_mak
 fi

-if test "$gcc_attribute_warn_unused_result" = "yes" ; then
-  echo "CONFIG_GCC_ATTRIBUTE_WARN_UNUSED_RESULT=y" >> $config_host_mak
-fi

 if test "$fdatasync" = "yes" ; then
   echo "CONFIG_FDATASYNC=y" >> $config_host_mak
 fi
 if test "$fdatasync" = "yes" ; then
   echo "CONFIG_FDATASYNC=y" >> $config_host_mak
 fi


@@ -2915,6 +3034,10 @@ if test "$smartcard_nss" = "yes" ; then
   echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
 fi
 
   echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
 fi
 

+if test "$usb_redir" = "yes" ; then
+  echo "CONFIG_USB_REDIR=y" >> $config_host_mak
+fi
+

 if test "$opengl" = "yes" ; then
   echo "CONFIG_OPENGL=y" >> $config_host_mak
 fi
 if test "$opengl" = "yes" ; then
   echo "CONFIG_OPENGL=y" >> $config_host_mak
 fi


@@ -2933,6 +3056,18 @@ if test "$rbd" = "yes" ; then
   echo "CONFIG_RBD=y" >> $config_host_mak
 fi
 
   echo "CONFIG_RBD=y" >> $config_host_mak
 fi
 

+if test "$ucontext_coroutine" = "yes" ; then
+  echo "CONFIG_UCONTEXT_COROUTINE=y" >> $config_host_mak
+fi
+
+if test "$open_by_handle_at" = "yes" ; then
+  echo "CONFIG_OPEN_BY_HANDLE=y" >> $config_host_mak
+fi
+
+if test "$linux_magic_h" = "yes" ; then
+  echo "CONFIG_LINUX_MAGIC_H=y" >> $config_host_mak
+fi
+

 # USB host support
 case "$usb" in
 linux)
 # USB host support
 case "$usb" in
 linux)


@@ -2946,26 +3081,44 @@ bsd)
 ;;
 esac
 
 ;;
 esac
 

+# use default implementation for tracing backend-specific routines
+trace_default=yes

 echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak
 echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak

-if test "$trace_backend" = "simple"; then
-  echo "CONFIG_SIMPLE_TRACE=y" >> $config_host_mak
+if test "$trace_backend" = "nop"; then
+  echo "CONFIG_TRACE_NOP=y" >> $config_host_mak

 fi
 fi

-# Set the appropriate trace file.

 if test "$trace_backend" = "simple"; then
 if test "$trace_backend" = "simple"; then

+  echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak
+  trace_default=no
+  # Set the appropriate trace file.

   trace_file="\"$trace_file-\" FMT_pid"
 fi
   trace_file="\"$trace_file-\" FMT_pid"
 fi

-if test "$trace_backend" = "dtrace" -a "$trace_backend_stap" = "yes" ; then
-  echo "CONFIG_SYSTEMTAP_TRACE=y" >> $config_host_mak
+if test "$trace_backend" = "stderr"; then
+  echo "CONFIG_TRACE_STDERR=y" >> $config_host_mak
+  trace_default=no
+fi
+if test "$trace_backend" = "ust"; then
+  echo "CONFIG_TRACE_UST=y" >> $config_host_mak
+fi
+if test "$trace_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_FILE=$trace_file" >> $config_host_mak
 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

 
 echo "TOOLS=$tools" >> $config_host_mak
 echo "ROMS=$roms" >> $config_host_mak
 echo "MAKE=$make" >> $config_host_mak
 echo "INSTALL=$install" >> $config_host_mak
 
 echo "TOOLS=$tools" >> $config_host_mak
 echo "ROMS=$roms" >> $config_host_mak
 echo "MAKE=$make" >> $config_host_mak
 echo "INSTALL=$install" >> $config_host_mak

-echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
-echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
-echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
+echo "INSTALL_DIR=$install -d -m 0755" >> $config_host_mak
+echo "INSTALL_DATA=$install -c -m 0644" >> $config_host_mak
+echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak
+echo "PYTHON=$python" >> $config_host_mak

 echo "CC=$cc" >> $config_host_mak
 echo "CC_I386=$cc_i386" >> $config_host_mak
 echo "HOST_CC=$host_cc" >> $config_host_mak
 echo "CC=$cc" >> $config_host_mak
 echo "CC_I386=$cc_i386" >> $config_host_mak
 echo "HOST_CC=$host_cc" >> $config_host_mak


@@ -2989,6 +3142,7 @@ echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
 echo "LIBS+=$LIBS" >> $config_host_mak
 echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak
 echo "LIBS+=$LIBS" >> $config_host_mak
 echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak

+echo "LIBS_QGA+=$libs_qga" >> $config_host_mak

 
 # generate list of library paths for linker script
 
 
 # generate list of library paths for linker script
 


@@ -3018,7 +3172,7 @@ target_arch2=`echo $target | cut -d '-' -f 1`
 target_bigendian="no"
 
 case "$target_arch2" in
 target_bigendian="no"
 
 case "$target_arch2" in

-  armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus)
+  armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)

   target_bigendian=yes
   ;;
 esac
   target_bigendian=yes
   ;;
 esac


@@ -3155,7 +3309,7 @@ case "$target_arch2" in
   ;;
   ppc)
     gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
   ;;
   ppc)
     gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"

-    target_phys_bits=32
+    target_phys_bits=64

     target_nptl="yes"
     target_libs_softmmu="$fdt_libs"
   ;;
     target_nptl="yes"
     target_libs_softmmu="$fdt_libs"
   ;;


@@ -3213,6 +3367,10 @@ case "$target_arch2" in
   unicore32)
     target_phys_bits=32
   ;;
   unicore32)
     target_phys_bits=32
   ;;

+  xtensa|xtensaeb)
+    TARGET_ARCH=xtensa
+    target_phys_bits=32
+  ;;

   *)
     echo "Unsupported target CPU"
     exit 1
   *)
     echo "Unsupported target CPU"
     exit 1


@@ -3240,10 +3398,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 "$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
     fi

+    ;;
+  *)
+    echo "CONFIG_NO_XEN=y" >> $config_target_mak

 esac
 case "$target_arch2" in
   i386|x86_64|ppcemb|ppc|ppc64|s390x)
 esac
 case "$target_arch2" in
   i386|x86_64|ppcemb|ppc|ppc64|s390x)


@@ -3257,11 +3417,14 @@ case "$target_arch2" in
       \( "$target_arch2" = "x86_64" -a "$cpu" = "i386"   \) -o \
       \( "$target_arch2" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_target_mak
       \( "$target_arch2" = "x86_64" -a "$cpu" = "i386"   \) -o \
       \( "$target_arch2" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_target_mak

-      if test $vhost_net = "yes" ; then
+      if test "$vhost_net" = "yes" ; then

         echo "CONFIG_VHOST_NET=y" >> $config_target_mak
       fi
     fi
 esac
         echo "CONFIG_VHOST_NET=y" >> $config_target_mak
       fi
     fi
 esac

+if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then
+  echo "CONFIG_PSERIES=y" >> $config_target_mak
+fi

 if test "$target_bigendian" = "yes" ; then
   echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
 fi
 if test "$target_bigendian" = "yes" ; then
   echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
 fi


@@ -3324,7 +3487,6 @@ else
   includes="-I\$(SRC_PATH)/tcg/\$(ARCH) $includes"
 fi
 includes="-I\$(SRC_PATH)/tcg $includes"
   includes="-I\$(SRC_PATH)/tcg/\$(ARCH) $includes"
 fi
 includes="-I\$(SRC_PATH)/tcg $includes"

-includes="-I\$(SRC_PATH)/fpu $includes"

 
 if test "$target_user_only" = "yes" ; then
     libdis_config_mak=libdis-user/config.mak
 
 if test "$target_user_only" = "yes" ; then
     libdis_config_mak=libdis-user/config.mak


@@ -3386,6 +3548,10 @@ for i in $ARCH $TARGET_BASE_ARCH ; do
     echo "CONFIG_SPARC_DIS=y"  >> $config_target_mak
     echo "CONFIG_SPARC_DIS=y"  >> $libdis_config_mak
   ;;
     echo "CONFIG_SPARC_DIS=y"  >> $config_target_mak
     echo "CONFIG_SPARC_DIS=y"  >> $libdis_config_mak
   ;;

+  xtensa*)
+    echo "CONFIG_XTENSA_DIS=y"  >> $config_target_mak
+    echo "CONFIG_XTENSA_DIS=y"  >> $libdis_config_mak
+  ;;

   esac
 done
 
   esac
 done
 


@@ -3478,12 +3644,20 @@ DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
 DIRS="$DIRS pc-bios/spapr-rtas"
 DIRS="$DIRS roms/seabios roms/vgabios"
 DIRS="$DIRS fsdev ui"
 DIRS="$DIRS pc-bios/spapr-rtas"
 DIRS="$DIRS roms/seabios roms/vgabios"
 DIRS="$DIRS fsdev ui"

-FILES="Makefile tests/Makefile"
+DIRS="$DIRS qapi qapi-generated"
+DIRS="$DIRS qga trace"
+FILES="Makefile tests/Makefile qdict-test-data.txt"

 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
 FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
 FILES="$FILES pc-bios/spapr-rtas/Makefile"
 FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
 FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
 FILES="$FILES pc-bios/spapr-rtas/Makefile"
 FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"

-for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.rom $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
+for bios_file in \
+    $source_path/pc-bios/*.bin \
+    $source_path/pc-bios/*.rom \
+    $source_path/pc-bios/*.dtb \
+    $source_path/pc-bios/openbios-* \
+    $source_path/pc-bios/palcode-*
+do

     FILES="$FILES pc-bios/`basename $bios_file`"
 done
 mkdir -p $DIRS
     FILES="$FILES pc-bios/`basename $bios_file`"
 done
 mkdir -p $DIRS


@@ -3524,6 +3698,7 @@ fi
 
 d=libuser
 mkdir -p $d
 
 d=libuser
 mkdir -p $d

+mkdir -p $d/trace

 symlink $source_path/Makefile.user $d/Makefile
 if test "$static" = "no" -a "$user_pie" = "yes" ; then
   echo "QEMU_CFLAGS+=-fpie" > $d/config.mak
 symlink $source_path/Makefile.user $d/Makefile
 if test "$static" = "no" -a "$user_pie" = "yes" ; then
   echo "QEMU_CFLAGS+=-fpie" > $d/config.mak