Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  configure: report missing libraries for virtfs
  trace/simple.c: fix deprecated glib2 interface
  Clarify comments of tb_invalidate_phys_[page_]range

diff --combined configure
index dd0d2b3b11953e8881af2ce61f4de8a4a4f21f5e,e8f0172b4b1c12632e348ddd414f3889cb739673..c2366eef45926c38c360ff1c257c1cb4d2e4b9aa
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -42,7 -42,6 +42,7 @@@ compile_prog() 
  # symbolically link $1 to $2.  Portable version of "ln -sf".
  symlink() {
    rm -rf "$2"
 +  mkdir -p "$(dirname "$2")"
    ln -s "$1" "$2"
  }
  
@@@ -2916,7 -2915,8 +2916,8 @@@ if test "$softmmu" = yes ; the
        tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
      else
        if test "$virtfs" = yes; then
-         feature_not_found "virtfs"
+         echo "VirtFS is supported only on Linux and requires libcap-devel and libattr-devel"
+         exit 1
        fi
        virtfs=no
      fi
@@@ -2928,9 -2928,6 +2929,9 @@@
      fi
    fi
  fi
 +if test "$smartcard_nss" = "yes" ; then
 +  tools="vscclient\$(EXESUF) $tools"
 +fi
  
  # Mac OS X ships with a broken assembler
  roms=
@@@ -3455,12 -3452,14 +3456,12 @@@ if test -f ${config_host_ld}~ ; the
  fi
  
  for d in libdis libdis-user; do
 -    mkdir -p $d
      symlink "$source_path/Makefile.dis" "$d/Makefile"
      echo > $d/config.mak
  done
  
  # use included Linux headers
  if test "$linux" = "yes" ; then
 -  mkdir -p linux-headers
    case "$cpu" in
    i386|x86_64)
      symlink "$source_path/linux-headers/asm-x86" linux-headers/asm
@@@ -3516,6 -3515,18 +3517,6 @@@ case "$target" i
  esac
  
  mkdir -p $target_dir
 -mkdir -p $target_dir/fpu
 -mkdir -p $target_dir/tcg
 -mkdir -p $target_dir/ide
 -mkdir -p $target_dir/usb
 -mkdir -p $target_dir/9pfs
 -mkdir -p $target_dir/kvm
 -if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
 -  mkdir -p $target_dir/nwfpe
 -fi
 -symlink "$source_path/Makefile.target" "$target_dir/Makefile"
 -
 -
  echo "# Automatically generated by configure - do not modify" > $config_target_mak
  
  bflt="no"
@@@ -3666,16 -3677,9 +3667,16 @@@ case "$target_arch2" i
      exit 1
    ;;
  esac
 +# TARGET_BASE_ARCH needs to be defined after TARGET_ARCH
 +if [ "$TARGET_BASE_ARCH" = "" ]; then
 +  TARGET_BASE_ARCH=$TARGET_ARCH
 +fi
 +
 +symlink "$source_path/Makefile.target" "$target_dir/Makefile"
 +
  
  case "$target_arch2" in
 -  alpha | sparc*)
 +  alpha | sparc* | xtensa*)
      echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak
    ;;
  esac
@@@ -3688,6 -3692,10 +3689,6 @@@ echo "TARGET_ARCH=$TARGET_ARCH" >> $con
  target_arch_name="`echo $TARGET_ARCH | LC_ALL=C tr '[a-z]' '[A-Z]'`"
  echo "TARGET_$target_arch_name=y" >> $config_target_mak
  echo "TARGET_ARCH2=$target_arch2" >> $config_target_mak
 -# TARGET_BASE_ARCH needs to be defined after TARGET_ARCH
 -if [ "$TARGET_BASE_ARCH" = "" ]; then
 -  TARGET_BASE_ARCH=$TARGET_ARCH
 -fi
  echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak
  if [ "$TARGET_ABI_DIR" = "" ]; then
    TARGET_ABI_DIR=$TARGET_ARCH
@@@ -3894,6 -3902,12 +3895,6 @@@ if test "$target_softmmu" = "yes" ; the
    esac
  fi
  
 -if test "$target_softmmu" = "yes" -a \( \
 -        "$TARGET_ARCH" = "microblaze" -o \
 -        "$TARGET_ARCH" = "cris" \) ; then
 -  echo "CONFIG_NEED_MMU=y" >> $config_target_mak
 -fi
 -
  if test "$gprof" = "yes" ; then
    echo "TARGET_GPROF=yes" >> $config_target_mak
    if test "$target_linux_user" = "yes" ; then
@@@ -3935,13 -3949,15 +3936,13 @@@ done # for target in $target
  
  # 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"
 -DIRS="$DIRS slirp audio block net pc-bios/optionrom"
 -DIRS="$DIRS pc-bios/spapr-rtas"
 +DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
  DIRS="$DIRS roms/seabios roms/vgabios"
 -DIRS="$DIRS fsdev ui usb"
 -DIRS="$DIRS qapi qapi-generated"
 -DIRS="$DIRS qga trace qom"
 +DIRS="$DIRS qapi-generated"
 +DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
  FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
  FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
 -FILES="$FILES tests/tcg/lm32/Makefile"
 +FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"
  FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
  FILES="$FILES pc-bios/spapr-rtas/Makefile"
  FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
@@@ -3976,11 -3992,24 +3977,11 @@@ don
  
  for hwlib in 32 64; do
    d=libhw$hwlib
 -  mkdir -p $d
 -  mkdir -p $d/ide
 -  mkdir -p $d/usb
    symlink "$source_path/Makefile.hw" "$d/Makefile"
 -  mkdir -p $d/9pfs
    echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
  done
  
 -if [ "$source_path" != `pwd` ]; then
 -    # out of tree build
 -    mkdir -p libcacard
 -    symlink "$source_path/libcacard/Makefile" libcacard/Makefile
 -fi
 -
  d=libuser
 -mkdir -p $d
 -mkdir -p $d/trace
 -mkdir -p $d/qom
  symlink "$source_path/Makefile.user" "$d/Makefile"
  
  if test "$docs" = "yes" ; then

diff --combined exec.c
index a587e7a12278dc41639a4abcf032c8e1f7118f3f,eacaf3cf412294e90af12d3e3f0e9bbe5916a1d8..5c9b7627bfec5b302530c7566600c45da7c10385
--- 1/exec.c
--- 2/exec.c
+++ b/exec.c
@@@ -1076,11 -1076,11 +1076,11 @@@ TranslationBlock *tb_gen_code(CPUArchSt
  }
  
  /*
-  * invalidate all TBs which intersect with the target physical pages
-  * starting in range [start;end[. NOTE: start and end may refer to
-  * different physical pages. 'is_cpu_write_access' should be true if called
-  * from a real cpu write access: the virtual CPU will exit the current
-  * TB if code is modified inside this TB.
+  * Invalidate all TBs which intersect with the target physical address range
+  * [start;end[. NOTE: start and end may refer to *different* physical pages.
+  * 'is_cpu_write_access' should be true if called from a real cpu write
+  * access: the virtual CPU will exit the current TB if code is modified inside
+  * this TB.
   */
  void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end,
                                int is_cpu_write_access)
@@@ -1092,11 -1092,13 +1092,13 @@@
      }
  }
  
- /* invalidate all TBs which intersect with the target physical page
-    starting in range [start;end[. NOTE: start and end must refer to
-    the same physical page. 'is_cpu_write_access' should be true if called
-    from a real cpu write access: the virtual CPU will exit the current
-    TB if code is modified inside this TB. */
+ /*
+  * Invalidate all TBs which intersect with the target physical address range
+  * [start;end[. NOTE: start and end must refer to the *same* physical page.
+  * 'is_cpu_write_access' should be true if called from a real cpu write
+  * access: the virtual CPU will exit the current TB if code is modified inside
+  * this TB.
+  */
  void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
                                     int is_cpu_write_access)
  {
@@@ -1492,8 -1494,7 +1494,8 @@@ void tb_invalidate_phys_addr(target_phy
  
  static void breakpoint_invalidate(CPUArchState *env, target_ulong pc)
  {
 -    tb_invalidate_phys_addr(cpu_get_phys_page_debug(env, pc));
 +    tb_invalidate_phys_addr(cpu_get_phys_page_debug(env, pc) |
 +            (pc & ~TARGET_PAGE_MASK));
  }
  #endif
  #endif /* TARGET_HAS_ICE */