Merge remote-tracking branch 'mjt/trivial-patches-next' into staging

# By Michael Tokarev (4) and others
# Via Michael Tokarev
* mjt/trivial-patches-next: (26 commits)
  piix: fix some printf errors when debug is enabled
  cputlb: fix debug logs
  create qemu_openpty_raw() helper function and move it to a separate file
  main-loop: do not include slirp/slirp.h, use libslirp.h instead
  libcacard/vscclient: fix leakage of socket on error paths
  linux-headers: Update to v3.10-rc5
  KVM: PPC: Add dummy kvm_arch_init_irq_routing()
  KVM: S390: Add dummy kvm_arch_init_irq_routing()
  KVM: ARM: Add dummy kvm_arch_init_irq_routing()
  ivshmem: add missing error exit(2)
  hw/xen: Use g_free instead of free and fix potential memory leaks
  target-sparc: Replace free by g_free
  hw/scsi: Don't increment a boolean value
  device tree: Fix cppcheck warning
  Makefile: Install qemu-img and qemu-nbd man pages only if built
  Unbreak -no-quit for GTK, validate SDL options
  gtk: implement -full-screen
  char/serial: serial_ioport_write: Factor out common code
  char/serial: Use generic Fifo8
  char/serial: cosmetic fixes.
  ...

Message-id: 1371207042-17980-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --combined configure
index 05a788049533df16f9a71c25ba24120a6f26f082,a3f0b7ad4a5a8d6d3e7cb98537e264bcfcea5152..60b08117069e6cf16ef85d343fff9ed4457bf8ee
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -386,8 -386,6 +386,8 @@@ elif check_define __s390__ ; the
    fi
  elif check_define __arm__ ; then
    cpu="arm"
 +elif check_define __aarch64__ ; then
 +  cpu="aarch64"
  elif check_define __hppa__ ; then
    cpu="hppa"
  else
@@@ -410,9 -408,6 +410,9 @@@ case "$cpu" i
    armv*b|armv*l|arm)
      cpu="arm"
    ;;
 +  aarch64)
 +    cpu="aarch64"
 +  ;;
    hppa|parisc|parisc64)
      cpu="hppa"
    ;;
@@@ -558,7 -553,9 +558,9 @@@ esa
  
  if [ "$bsd" = "yes" ] ; then
    if [ "$darwin" != "yes" ] ; then
-     usb="bsd"
+     if [ "$targetos" != "FreeBSD" ]; then
+       usb="bsd"
+     fi
      bsd_user="yes"
    fi
  fi
@@@ -2562,6 -2559,29 +2564,6 @@@ EO
    fi
  fi
  
 -#
 -# Check for xxxat() functions when we are building linux-user
 -# emulator.  This is done because older glibc versions don't
 -# have syscall stubs for these implemented.
 -#
 -atfile=no
 -cat > $TMPC << EOF
 -#define _ATFILE_SOURCE
 -#include <sys/types.h>
 -#include <fcntl.h>
 -#include <unistd.h>
 -
 -int
 -main(void)
 -{
 -      /* try to unlink nonexisting file */
 -      return (unlinkat(AT_FDCWD, "nonexistent_file", 0));
 -}
 -EOF
 -if compile_prog "" "" ; then
 -  atfile=yes
 -fi
 -
  # Check for inotify functions when we are building linux-user
  # emulator.  This is done because older glibc versions don't
  # have syscall stubs for these implemented.  In that case we
@@@ -3538,7 -3558,6 +3540,6 @@@ echo "-> Your SDL version is too old - 
  fi
  
  config_host_mak="config-host.mak"
- config_host_ld="config-host.ld"
  
  echo "# Automatically generated by configure - do not modify" >config-all-disas.mak
  
@@@ -3704,6 -3723,9 +3705,6 @@@ f
  if test "$curses" = "yes" ; then
    echo "CONFIG_CURSES=y" >> $config_host_mak
  fi
 -if test "$atfile" = "yes" ; then
 -  echo "CONFIG_ATFILE=y" >> $config_host_mak
 -fi
  if test "$utimens" = "yes" ; then
    echo "CONFIG_UTIMENSAT=y" >> $config_host_mak
  fi
@@@ -4050,7 -4072,7 +4051,7 @@@ if test "$gcov" = "yes" ; the
  fi
  
  # generate list of library paths for linker script
- $ld --verbose -v 2> /dev/null | grep SEARCH_DIR > ${config_host_ld}
+ $ld --verbose -v 2> /dev/null | grep SEARCH_DIR > config-host.ld
  
  # use included Linux headers
  if test "$linux" = "yes" ; then
@@@ -4065,9 -4087,6 +4066,9 @@@
    s390x)
      linux_arch=s390
      ;;
 +  aarch64)
 +    linux_arch=arm64
 +    ;;
    *)
      # For most CPUs the kernel architecture name and QEMU CPU name match.
      linux_arch="$cpu"
@@@ -4280,11 -4299,19 +4281,11 @@@ case "$target_arch2" i
        fi
      fi
  esac
 -case "$target_arch2" in
 -  i386|x86_64)
 -    echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak
 -esac
  if test "$target_bigendian" = "yes" ; then
    echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
  fi
  if test "$target_softmmu" = "yes" ; then
    echo "CONFIG_SOFTMMU=y" >> $config_target_mak
 -  case "$target_arch2" in
 -    i386|x86_64)
 -      echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
 -  esac
  fi
  if test "$target_user_only" = "yes" ; then
    echo "CONFIG_USER_ONLY=y" >> $config_target_mak
@@@ -4424,7 -4451,7 +4425,7 @@@ f
  
  if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then
    case "$ARCH" in
 -  alpha | s390x)
 +  alpha | s390x | aarch64)
      # The default placement of the application is fine.
      ;;
    *)