From: Anthony Liguori Date: Mon, 29 Jul 2013 16:33:48 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/block' into staging X-Git-Tag: v1.6.0-rc0~18 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=eddbf0ab9db8385d7cb57e23891c1d41488b303e Merge remote-tracking branch 'stefanha/block' into staging # By Stefan Hajnoczi (4) and others # Via Stefan Hajnoczi * stefanha/block: dataplane: refuse to start if device is already in use dataplane: enable virtio-blk x-data-plane=on live migration migration: fix spice migration migration: notify migration state before starting thread block: Repair the throttling code. gluster: Add image resize support Message-id: 1375112172-24863-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori --- eddbf0ab9db8385d7cb57e23891c1d41488b303e