OSDN Git Service

Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Aug 2012 18:25:47 +0000 (13:25 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Aug 2012 18:25:47 +0000 (13:25 -0500)
commitfdef621b5810cf8d6715e04d883a0f3523873014
treee6979f169764792f0ebd75596dd90f454aca4510
parentcc92186773df8c9aae8f812fff85e7325e1d7583
parent58c8cce21c13bddd332590fb1fd9a5c369975d3f
Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
  qemu-iotests: Fix 030 after switch to GenericError
  block: Flush parent to OS with cache=unsafe
  iscsi: Fix NULL dereferences / races between task completion and abort
  monitor: Clean up fd sets on monitor disconnect
  block: Enable qemu_open/close to work with fd sets
  block: Convert close calls to qemu_close
  block: Convert open calls to qemu_open
  block: Prevent detection of /dev/fdset/ as floppy
  qapi: Introduce add-fd, remove-fd, query-fdsets
  qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg