Merge remote-tracking branch 'kwolf/for-anthony' into staging
commit5699a02e01a4d046652bc6e77abd67e887ae209c
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 15 Jul 2013 19:00:32 +0000 (15 14:00 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 15 Jul 2013 19:00:32 +0000 (15 14:00 -0500)
tree9b5f353025bb767ad0fbf10fc9d6488be7831b13
parentc3cb8e77804313e1be99b5f28a34a346736707a5
parenta62eaa26c1d6d48fbdc3ac1d32bd1314f5fdc8c9
Merge remote-tracking branch 'kwolf/for-anthony' into staging

# By Kevin Wolf (6) and Stefan Hajnoczi (2)
# Via Kevin Wolf
* kwolf/for-anthony:
  ahci: Fix FLUSH command
  migration: Fail migration on bdrv_flush_all() error
  cpus: Add return value for vm_stop()
  block: Add return value for bdrv_flush_all()
  qemu-iotests: Update 051 reference output
  block: Don't parse protocol from file.filename
  block: add drive_backup HMP command
  blockdev: add sync mode to drive-backup QMP command

Message-id: 1373887000-4488-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>