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

* kraxel/usb.69: (31 commits)
  usb-redir: Allow redirecting super speed devices to high speed controllers
  usb-redir: Allow to attach USB 2.0 devices to 1.1 host controller
  usb-redir: Use reject rather the disconnect on bad ep info
  usb-redir: Add an usbredir_setup_usb_eps() helper function
  usb-redir: Add support for input pipelining
  usb-redir: Add support for 32 bits bulk packet length
  combined-packet: Add a workaround for Linux usbfs + live migration
  usb: Add packet combining functions
  uhci: Don't crash on device disconnect
  uhci: Add a uhci_handle_td_error() helper function
  usb/ehci-pci: add helper to create ich9 usb controllers
  usb/ehci-pci: add ich9 00:1a.* variant
  usb/ehci-pci: dynamic type generation
  uhci: add ich9 00:1a.* variants
  uhci: stick irq routing info into UHCIInfo too.
  uhci: dynamic type generation
  xilinx_zynq: add USB controllers
  usb/ehci: add sysbus variant
  usb/ehci: split into multiple source files
  usb/ehci: Guard definition of EHCI_DEBUG
  ...

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

diff --combined configure
index 79701ea27b15b99616af1e0265a3238f606b4ad6,fbebf0f448f3ebffdd0243884be8a189191f3d45..ba99f67dd5bbd227b25fa0a13482bf88ab065f82
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -147,7 -147,6 +147,7 @@@ curses="
  docs=""
  fdt=""
  nptl=""
 +pixman=""
  sdl=""
  virtfs=""
  vnc="yes"
@@@ -643,10 -642,6 +643,10 @@@ for opt d
      # configure to be used by RPM and similar macros that set
      # lots of directory switches by default.
    ;;
 +  --with-system-pixman) pixman="system"
 +  ;;
 +  --without-system-pixman) pixman="internal"
 +  ;;
    --disable-sdl) sdl="no"
    ;;
    --enable-sdl) sdl="yes"
@@@ -2099,34 -2094,6 +2099,34 @@@ els
      exit 1
  fi
  
 +##########################################
 +# pixman support probe
 +
 +if test "$pixman" = ""; then
 +  if $pkg_config pixman-1 > /dev/null 2>&1; then
 +    pixman="system"
 +  else
 +    pixman="internal"
 +  fi
 +fi
 +if test "$pixman" = "system"; then
 +  pixman_cflags=`$pkg_config --cflags pixman-1 2>/dev/null`
 +  pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`
 +else
 +  if test ! -d ${source_path}/pixman/pixman; then
 +    echo "ERROR: pixman not present. Your options:"
 +    echo "  (1) Prefered: Install the pixman devel package (any recent"
 +    echo "      distro should have packages as Xorg needs pixman too)."
 +    echo "  (2) Fetch the pixman submodule, using:"
 +    echo "      git submodule update --init pixman"
 +    exit 1
 +  fi
 +  pixman_cflags="-I${source_path}/pixman/pixman"
 +  pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
 +fi
 +QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
 +libs_softmmu="$libs_softmmu $pixman_libs"
 +
  ##########################################
  # libcap probe
  
@@@ -2788,7 -2755,7 +2788,7 @@@ f
  
  # check for usbredirparser for usb network redirection support
  if test "$usb_redir" != "no" ; then
-     if $pkg_config --atleast-version=0.5 libusbredirparser-0.5 >/dev/null 2>&1 ; then
+     if $pkg_config --atleast-version=0.5.3 libusbredirparser-0.5 >/dev/null 2>&1 ; then
          usb_redir="yes"
          usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null)
          usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null)
@@@ -3175,7 -3142,6 +3175,7 @@@ echo "-Werror enabled   $werror
  if test "$darwin" = "yes" ; then
      echo "Cocoa support     $cocoa"
  fi
 +echo "pixman            $pixman"
  echo "SDL support       $sdl"
  echo "curses support    $curses"
  echo "curl support      $curl"
@@@ -3942,9 -3908,6 +3942,9 @@@ if test "$target_softmmu" = "yes" ; the
    if test "$smartcard_nss" = "yes" ; then
      echo "subdir-$target: subdir-libcacard" >> $config_host_mak
    fi
 +  if test "$pixman" = "internal" ; then
 +    echo "subdir-$target: subdir-pixman" >> $config_host_mak
 +  fi
    case "$target_arch2" in
      i386|x86_64)
        echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
@@@ -4148,7 -4111,6 +4148,7 @@@ DIRS="$DIRS pc-bios/optionrom pc-bios/s
  DIRS="$DIRS roms/seabios roms/vgabios"
  DIRS="$DIRS qapi-generated"
  DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
 +DIRS="$DIRS pixman"
  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 libcacard/Makefile"

diff --combined trace-events
index 066cdaf15ed99eaf402f4fae64c7ef8b816d8e62,0cb991e7897e349db1cf3ba68e6fc1fa49cd6cb3..b84d631dc783b95c5671a2ec55d28f06a53fb4ef
--- 1/trace-events
--- 2/trace-events
+++ b/trace-events
@@@ -98,11 -98,6 +98,11 @@@ virtio_blk_rw_complete(void *req, int r
  virtio_blk_handle_write(void *req, uint64_t sector, size_t nsectors) "req %p sector %"PRIu64" nsectors %zu"
  virtio_blk_handle_read(void *req, uint64_t sector, size_t nsectors) "req %p sector %"PRIu64" nsectors %zu"
  
 +# thread-pool.c
 +thread_pool_submit(void *req, void *opaque) "req %p opaque %p"
 +thread_pool_complete(void *req, void *opaque, int ret) "req %p opaque %p ret %d"
 +thread_pool_cancel(void *req, void *opaque) "req %p opaque %p"
 +
  # posix-aio-compat.c
  paio_submit(void *acb, void *opaque, int64_t sector_num, int nb_sectors, int type) "acb %p opaque %p sector_num %"PRId64" nb_sectors %d type %d"
  paio_complete(void *acb, void *opaque, int ret) "acb %p opaque %p ret %d"
@@@ -338,6 -333,8 +338,8 @@@ usb_xhci_irq_msix_use(uint32_t nr) "nr 
  usb_xhci_irq_msix_unuse(uint32_t nr) "nr %d"
  usb_xhci_queue_event(uint32_t vector, uint32_t idx, const char *trb, const char *evt, uint64_t param, uint32_t status, uint32_t control) "v %d, idx %d, %s, %s, p %016" PRIx64 ", s %08x, c 0x%08x"
  usb_xhci_fetch_trb(uint64_t addr, const char *name, uint64_t param, uint32_t status, uint32_t control) "addr %016" PRIx64 ", %s, p %016" PRIx64 ", s %08x, c 0x%08x"
+ usb_xhci_port_reset(uint32_t port) "port %d"
+ usb_xhci_port_link(uint32_t port, uint32_t pls) "port %d, pls %d"
  usb_xhci_slot_enable(uint32_t slotid) "slotid %d"
  usb_xhci_slot_disable(uint32_t slotid) "slotid %d"
  usb_xhci_slot_address(uint32_t slotid) "slotid %d"