From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 4 Mar 2013 14:22:48 +0000 (-0600)
Subject: Merge remote-tracking branch 'stefanha/block' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=71df81afc618da79008a7071a666cf97b62e1237;p=qemu.git

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

# By MORITA Kazutaka (5) and others
# Via Stefan Hajnoczi
* stefanha/block:
  block: for HMP commit() operations on 'all', skip non-COW drives
  sheepdog: add support for connecting to unix domain socket
  sheepdog: use inet_connect to simplify connect code
  sheepdog: accept URIs
  move socket_set_nodelay to osdep.c
  slirp/tcp_subr.c: fix coding style in tcp_connect
  dataplane: remove EventPoll in favor of AioContext
  virtio-blk: fix unplug + virsh reboot
  ide/macio: Fix macio DMA initialisation.
---

71df81afc618da79008a7071a666cf97b62e1237