From: Anthony Liguori <aliguori@us.ibm.com>
Date: Sun, 20 Jan 2013 17:01:10 +0000 (-0600)
Subject: Merge remote-tracking branch 'stefanha/block' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8b17ed4caa7e015324a4ecbe3c863e32458d840a;p=qemu.git

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

# By Kevin Wolf (4) and others
# Via Stefan Hajnoczi
* stefanha/block:
  dataplane: support viostor virtio-pci status bit setting
  dataplane: avoid reentrancy during virtio_blk_data_plane_stop()
  win32-aio: use iov utility functions instead of open-coding them
  win32-aio: Fix memory leak
  win32-aio: Fix vectored reads
  aio: Fix return value of aio_poll()
  ide: Remove wrong assertion
  block: fix null-pointer bug on error case in block commit
---

8b17ed4caa7e015324a4ecbe3c863e32458d840a