]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'stefanha/block' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Sun, 20 Jan 2013 17:01:10 +0000 (11:01 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Sun, 20 Jan 2013 17:01:10 +0000 (11:01 -0600)
commit8b17ed4caa7e015324a4ecbe3c863e32458d840a
treee323612dffd78dd4cb75f58f731d208c0bf9ffce
parentb54c2873e731dd6fc81a4591cab909633b5a9eab
parentcf139388ad5b39228793f34eea99e0ea9a2924aa
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