Merge commit '303d4e865b74402b49f52e975c396c952f063e58' into upstream-merge

Merge commit '303d4e865b74402b49f52e975c396c952f063e58' into upstream-merge

* commit '303d4e865b74402b49f52e975c396c952f063e58': (30 commits)
  Introduce -machine command option.
  irq: Privatize CPU_INTERRUPT_NMI.
  target-i386: Privatize some i386-specific interrupt names.
  target-arm: Privatize CPU_INTERRUPT_FIQ.
  irq: Remove CPU_INTERRUPT_TIMER.
  target-sparc: Do not check CPU_INTERRUPT_TIMER.
  target-mips: Do not check CPU_INTERRUPT_TIMER.
  irq: Introduce and use CPU_INTERRUPT_SSTEP_MASK.
  irq: Introduce CPU_INTERRUPT_TGT_* defines.
  CPUPhysMemoryClient: Pass guest physical address not region offset
  CPUPhysMemoryClient: Fix typo in phys memory client registration
  pci: Add class 0x403 as 'audio controller'
  usb: mass storage fix
  usb: move complete callback to port ops
  musb: get musb state via container_of()
  ohci: get ohci state via container_of()
  uhci: keep uhci state pointer in async packet struct.
  uhci: switch to QTAILQ
  usb: control buffer fixes
  usb-linux: Add support for buffering iso out usb packets
  ...

Conflicts:
	vl.c

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