]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'stefanha/block' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 4 Mar 2013 14:22:48 +0000 (08:22 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 4 Mar 2013 14:22:48 +0000 (08:22 -0600)
commit71df81afc618da79008a7071a666cf97b62e1237
tree9452cebbcd6f1b769b460b4994f6a748e82c9b0f
parenta6900601caf2286a704bdc42da33e98c65feb3a9
parent272d2d8e1241b92ab9be87b2c8fb590fd84987a8
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.
qemu-options.hx