Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-05-07' into staging

trivial patches for 2014-05-07

# gpg: Signature made Wed 07 May 2014 18:01:15 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB

* remotes/mjt/tags/trivial-patches-2014-05-07: (21 commits)
  libcacard: remove unnecessary EOL from debug prints
  docs/memory.txt: Fix document on MMIO operations
  readline: Sort completions before printing them.
  readline: use g_strndup instead of open-coding it
  qmp: report path ambiguity error
  libcacard: replace pstrcpy() with memcpy()
  glib: move g_poll() replacement into glib-compat.h
  do not call g_thread_init() for glib >= 2.31
  hw/9pfs: Add include file for exported symbol
  xen: remove unused global, xen_xcg
  hw: Add missing 'static' attributes
  qemu-timer: Add missing 'static' attribute
  ui: Add missing 'static' attribute
  monitor: Add missing 'static' attribute
  hw/s390x: Add missing 'static' attribute
  hw/mips: Add missing 'static' and 'const' attributes
  hw/9pfs: Add missing 'static' attributes
  arch_init: Be sure of only one exit entry with DPRINTF() for ram_load()
  tests/tcg: Fix compilation of test_path
  qga: Fix typo (plural) in comment
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined configure
index b18f5316064dd147cdaa18d4bd1c738bd5442b57,f2ee87c0d61a9c42bf0a29bde9dea78bd37cc0dd..ac2fa159c6be861d8bfc9d21b2728c41f24e632f
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -403,14 -403,6 +403,14 @@@ f
  # make source path absolute
  source_path=`cd "$source_path"; pwd`
  
 +# running configure in the source tree?
 +# we know that's the case if configure is there.
 +if test -f "./configure"; then
 +    pwd_is_source_path="y"
 +else
 +    pwd_is_source_path="n"
 +fi
 +
  check_define() {
  cat > $TMPC <<EOF
  #if !defined($1)
@@@ -2632,7 -2624,7 +2632,7 @@@ don
  if test "$modules" = yes; then
      shacmd_probe="sha1sum sha1 shasum"
      for c in $shacmd_probe; do
-         if which $c &>/dev/null; then
+         if which $c >/dev/null 2>&1; then
              shacmd="$c"
              break
          fi
@@@ -2948,7 -2940,7 +2948,7 @@@ EO
      fdt=yes
      dtc_internal="yes"
      mkdir -p dtc
 -    if [ "$source_path" != `pwd` ] ; then
 +    if [ "$pwd_is_source_path" != "y" ] ; then
         symlink "$source_path/dtc/Makefile" "dtc/Makefile"
         symlink "$source_path/dtc/scripts" "dtc/scripts"
      fi
@@@ -5184,7 -5176,7 +5184,7 @@@ d
  done
  mkdir -p $DIRS
  for f in $FILES ; do
 -    if [ -e "$source_path/$f" ] && [ "$source_path" != `pwd` ]; then
 +    if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" != "y" ]; then
          symlink "$source_path/$f" "$f"
      fi
  done