From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 1 Feb 2013 20:40:05 +0000 (-0600)
Subject: Merge remote-tracking branch 'stefanha/block' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=77a5f4f20371c5f564d670c25ad72443a9aa2ee6;p=qemu.git

Merge remote-tracking branch 'stefanha/block' into staging

# By Kevin Wolf (7) and others
# Via Stefan Hajnoczi
* stefanha/block:
  block/raw-posix: Build fix for O_ASYNC
  vmdk: Allow space in file name
  parallels: Fix bdrv_open() error handling
  dmg: Use g_free instead of free
  dmg: Fix bdrv_open() error handling
  vpc: Fix bdrv_open() error handling
  cloop: Fix bdrv_open() error handling
  bochs: Fix bdrv_open() error handling
  sheepdog: pass vdi_id to sheep daemon for sd_close()
  vmdk: Allow selecting SCSI adapter in image creation
  block: Adds mirroring tests for resized images
  block: Fix is_allocated_above with resized files
  qemu-iotests: Add regression test for b7ab0fea
---

77a5f4f20371c5f564d670c25ad72443a9aa2ee6