From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 15 Aug 2012 18:25:47 +0000 (-0500)
Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~3746
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fdef621b5810cf8d6715e04d883a0f3523873014;p=sdk%2Femulator%2Fqemu.git

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
---

fdef621b5810cf8d6715e04d883a0f3523873014