Merge commit 'a75bfc5fdda8b87ff969d68e020ffdf1008751b1' into upstream-merge

Merge commit 'a75bfc5fdda8b87ff969d68e020ffdf1008751b1' into upstream-merge

* commit 'a75bfc5fdda8b87ff969d68e020ffdf1008751b1': (328 commits)
  Revert "configure: Virtfs doesn't require libcap."
  os-posix: Fix build on FreeBSD
  main_loop_wait: block indefinitely
  qemu_next_alarm_deadline: check the expire time of a clock only if it is enabled
  timers: the rearm function should be able to handle delta = INT64_MAX
  target-i386: Fix x86_cpuid_set_model_id()
  qtest: Fix more format errors with qtest_sendf
  sdl: Add QEMU mascot icon for use with SDL
  qom: quick and dirty QOM filesystem based on FUSE
  pc-sysfw: make sure to call qdev_init
  nbd: Fix uninitialised use of s->sock
  usb-uhci: update irq line on reset
  usb: add serial number generator
  usb-redir: Not finding an async urb id is not an error
  usb-redir: Reset device address and speed on disconnect
  usb-redir: An interface count of 0 is a valid value
  usb-xhci: fix bit test
  usb-xhci: Use PCI DMA helper functions
  usb-host: fix zero-length packets
  usb-host: don't dereference invalid iovecs
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>