Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (117 commits)
  audio: Make PC speaker audio card available by default
  build: fix build breakage due to bad merge
  build: add make dist target (v2)
  qemu-options.hx: Fix set_password and expire_password description
  qemu-options.hx: Improve -nodefaults description
  qemu-options.hx: Improve -{read|write}config options description
  constify value pointer for qdev_prop_set_string
  doc: Fix indefinite article an -> a before nouns that begin with 'h'
  fdc-test: Clean up a bit
  fdc-test: introduce test_relative_seek
  fdc: fix relative seek
  qemu-iotests: Valgrind support
  coroutine-ucontext: Help valgrind understand coroutines
  qemu-io: Fix memory leaks
  hw/block-common: Factor out fall back to legacy -drive cyls=...
  blockdev: Don't limit DriveInfo serial to 20 characters
  hw/block-common: Factor out fall back to legacy -drive serial=...
  hw/block-common: Move BlockConf & friends from block.h
  Relax IDE CHS limits from 16383,16,63 to 65535,16,255
  blockdev: Drop redundant CHS validation for if=ide
  ...

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