tree 87effb14f8805fbde5146b783af493b2c7b7e3cd
parent d9cdcdb02c0ec9b564621f411395ca096645cd40
parent 6fffb4b8254f4ec232e6762cecc8bce8f7ebd132
author Marcelo Tosatti <mtosatti@redhat.com> 1280191433 -0300
committer Marcelo Tosatti <mtosatti@redhat.com> 1280191433 -0300

Merge branch 'stable-0.12-merge' into stable-0.12

* stable-0.12-merge:
  Update for 0.12.5 release
  audio/alsa: Handle SND_PCM_STATE_SETUP in alsa_poll_handler
  block: Handle multiwrite errors only when all requests have completed
  block: Fix early failure in multiwrite
  vpc: Use bdrv_(p)write_sync for metadata writes
  vmdk: Use bdrv_(p)write_sync for metadata writes
  qcow2: Use bdrv_(p)write_sync for metadata writes
  qcow: Use bdrv_(p)write_sync for metadata writes
  block: Add bdrv_(p)write_sync
  qcow2: Restore L1 entry on l2_allocate failure
  block/vdi: Fix image opening and creation for odd disk sizes
  block/vpc: Fix conversion from size to disk geometry
  qcow2: Remove abort on free_clusters failure
  vmdk: Fix COW
  qcow2: Fix creation of large images
  vmdk: fix double free
  qemu-options: add documentation for stdio signal=on|off

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