Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (91 commits)
  add copyright to spiceaudio
  spice: add audio
  intel-hda: fix codec addressing.
  Revert "intel-hda: fix codec addressing."
  intel-hda: fix codec addressing.
  intel-hda: add msi support
  intel-hda: update irq status on WAKEEN changes.
  intel-hda: Honor WAKEEN bits.
  hda-audio: exit cleanup
  intel-hda: exit cleanup
  Fix win32 build
  scsi-disk: Fix immediate failure of bdrv_aio_*
  virtio-blk: Handle immediate flush failure properly
  ide: Handle immediate bdrv_aio_flush failure
  block: avoid a warning on 64 bit hosts with long as int64_t
  qcow2: Invalidate cache after failed read
  vpc: Implement bdrv_flush
  scsi-disk: Implement werror for flushes
  scsi-disk: Complete failed requests in scsi_disk_emulate_command
  block: Allow bdrv_flush to return errors
  ...

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