Merge remote-tracking branch 'kraxel/usb.66' into staging

* kraxel/usb.66:
  usb: Fix usb_packet_map() in the presence of IOMMUs
  usb-redir: Adjust pkg-config check for usbredirparser .pc file rename (v2)
  ehci: Fix interrupt packet MULT handling
  xhci: create a memory region for each port
  xhci: route string & usb hub support
  xhci: tweak limits
  compat: turn off msi/msix on xhci for old machine types
  add pc-1.3 machine type

Conflicts:
	hw/pc_piix.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --combined configure
index 65bd876cd7b5b32d43698abb9fbacf0fbab41628,4f240620d7e37f8b9f04c7959cb58622995fb5f2..c5e5bb2e81f693518d8a5bb58165ccb47abc0be5
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1286,6 -1286,10 +1286,6 @@@ if test -z "$target_list" ; the
  else
      target_list=`echo "$target_list" | sed -e 's/,/ /g'`
  fi
 -if test -z "$target_list" ; then
 -    echo "No targets enabled"
 -    exit 1
 -fi
  # see if system emulation was really requested
  case " $target_list " in
    *"-softmmu "*) softmmu=yes
@@@ -2748,10 -2752,10 +2748,10 @@@ f
  
  # check for usbredirparser for usb network redirection support
  if test "$usb_redir" != "no" ; then
-     if $pkg_config --atleast-version=0.5 libusbredirparser >/dev/null 2>&1 ; then
+     if $pkg_config --atleast-version=0.5 libusbredirparser-0.5 >/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)
+         usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null)
+         usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null)
          QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"
          libs_softmmu="$libs_softmmu $usb_redir_libs"
      else
@@@ -3694,6 -3698,7 +3694,6 @@@ TARGET_ABI_DIR="
  
  case "$target_arch2" in
    i386)
 -    target_phys_bits=64
    ;;
    x86_64)
      TARGET_BASE_ARCH=i386
@@@ -3701,6 -3706,7 +3701,6 @@@
      target_long_alignment=8
    ;;
    alpha)
 -    target_phys_bits=64
      target_long_alignment=8
      target_nptl="yes"
    ;;
@@@ -3709,18 -3715,22 +3709,18 @@@
      bflt="yes"
      target_nptl="yes"
      gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
 -    target_phys_bits=64
      target_llong_alignment=4
      target_libs_softmmu="$fdt_libs"
    ;;
    cris)
      target_nptl="yes"
 -    target_phys_bits=32
    ;;
    lm32)
 -    target_phys_bits=32
      target_libs_softmmu="$opengl_libs"
    ;;
    m68k)
      bflt="yes"
      gdb_xml_files="cf-core.xml cf-fp.xml"
 -    target_phys_bits=32
      target_int_alignment=2
      target_long_alignment=2
      target_llong_alignment=2
@@@ -3729,30 -3739,36 +3729,30 @@@
      TARGET_ARCH=microblaze
      bflt="yes"
      target_nptl="yes"
 -    target_phys_bits=32
      target_libs_softmmu="$fdt_libs"
    ;;
    mips|mipsel)
      TARGET_ARCH=mips
      echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak
      target_nptl="yes"
 -    target_phys_bits=64
    ;;
    mipsn32|mipsn32el)
      TARGET_ARCH=mipsn32
      TARGET_BASE_ARCH=mips
      echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak
 -    target_phys_bits=64
    ;;
    mips64|mips64el)
      TARGET_ARCH=mips64
      TARGET_BASE_ARCH=mips
      echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
 -    target_phys_bits=64
      target_long_alignment=8
    ;;
    or32)
      TARGET_ARCH=openrisc
      TARGET_BASE_ARCH=openrisc
 -    target_phys_bits=32
    ;;
    ppc)
      gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
 -    target_phys_bits=64
      target_nptl="yes"
      target_libs_softmmu="$fdt_libs"
    ;;
@@@ -3760,6 -3776,7 +3760,6 @@@
      TARGET_BASE_ARCH=ppc
      TARGET_ABI_DIR=ppc
      gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
 -    target_phys_bits=64
      target_nptl="yes"
      target_libs_softmmu="$fdt_libs"
    ;;
@@@ -3767,6 -3784,7 +3767,6 @@@
      TARGET_BASE_ARCH=ppc
      TARGET_ABI_DIR=ppc
      gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
 -    target_phys_bits=64
      target_long_alignment=8
      target_libs_softmmu="$fdt_libs"
    ;;
@@@ -3776,17 -3794,21 +3776,17 @@@
      TARGET_ABI_DIR=ppc
      echo "TARGET_ABI32=y" >> $config_target_mak
      gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
 -    target_phys_bits=64
      target_libs_softmmu="$fdt_libs"
    ;;
    sh4|sh4eb)
      TARGET_ARCH=sh4
      bflt="yes"
      target_nptl="yes"
 -    target_phys_bits=32
    ;;
    sparc)
 -    target_phys_bits=64
    ;;
    sparc64)
      TARGET_BASE_ARCH=sparc
 -    target_phys_bits=64
      target_long_alignment=8
    ;;
    sparc32plus)
@@@ -3794,9 -3816,11 +3794,9 @@@
      TARGET_BASE_ARCH=sparc
      TARGET_ABI_DIR=sparc
      echo "TARGET_ABI32=y" >> $config_target_mak
 -    target_phys_bits=64
    ;;
    s390x)
      target_nptl="yes"
 -    target_phys_bits=64
      target_long_alignment=8
    ;;
    unicore32)
@@@ -3804,6 -3828,7 +3804,6 @@@
    ;;
    xtensa|xtensaeb)
      TARGET_ARCH=xtensa
 -    target_phys_bits=32
    ;;
    *)
      echo "Unsupported target CPU"
@@@ -3838,6 -3863,7 +3838,6 @@@ echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >
  case "$target_arch2" in
    i386|x86_64)
      if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
 -      target_phys_bits=64
        echo "CONFIG_XEN=y" >> $config_target_mak
        if test "$xen_pci_passthrough" = yes; then
          echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak"
@@@ -3877,10 -3903,11 +3877,10 @@@ if test "$target_bigendian" = "yes" ; t
    echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
  fi
  if test "$target_softmmu" = "yes" ; then
 -  echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
    echo "CONFIG_SOFTMMU=y" >> $config_target_mak
    echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
 -  echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
 -  echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
 +  echo "HWDIR=../libhw" >> $config_target_mak
 +  echo "subdir-$target: subdir-libhw" >> $config_host_mak
    if test "$smartcard_nss" = "yes" ; then
      echo "subdir-$target: subdir-libcacard" >> $config_host_mak
    fi
@@@ -4122,8 -4149,11 +4122,8 @@@ for rom in seabios vgabios ; d
      echo "LD=$ld" >> $config_mak
  done
  
 -for hwlib in 32 64; do
 -  d=libhw$hwlib
 -  symlink "$source_path/Makefile.hw" "$d/Makefile"
 -  echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
 -done
 +d=libhw
 +symlink "$source_path/Makefile.hw" "$d/Makefile"
  
  d=libuser
  symlink "$source_path/Makefile.user" "$d/Makefile"