Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (103 commits)
  scsi disk block descriptor v2
  Add some chipset doc links
  user: fix libuser build messages
  sparc64: fix done instruction pc
  qemu: allow pulseaudio to be the default
  Fixed wacom emulation
  rom loader: also try filename as-is.
  unlock iothread mutex before running kvm ioctl
  rom loader: fix sparc -kernel boot.
  TARGET_I386 is always defined if TARGET_X86_64 is defined
  slirp: fix !CONFIG_SLIRP compilation
  ide: BMDMAState don't need a pci_dev field anymore
  ide: cmd646 ->unit has just the value that we want
  ide: cmd646 we can get the pci device with container_of
  ide: 'secondary' field is only used by cmd646
  ide: PCIIDEState type field is not needed anymore
  ide: split cmd646 and piix from pci.c
  ide: export needed ide-pci functions for split
  ide: create ide/pci.h for common ide pci definitions
  ide: remove uselsess casts from void *
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>