diff mbox

[PULL,v2,for-2.0,00/24] Block patches

Message ID 20140314160220.GC23468@stefanha-thinkpad.redhat.com
State New
Headers show

Commit Message

Stefan Hajnoczi March 14, 2014, 4:02 p.m. UTC 
On Fri, Mar 14, 2014 at 09:28:36AM +0800, Hu Tao wrote:
> Do you forget this: https://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg05055.html?
> I suppose it will go through the block queue.

I forgot, sorry.  Since I explicitly acked it during soft-freeze, I have
tried to merge it for today's block pull request.

Unfortunately there is a qemu-iotests failure (in addition to merge
conflicts that I resolved manually):

082 2s ...        [16:57:34] [16:57:36] - output mismatch (see 082.out.bad)

Please rebase the series, fix the qemu-iotests failure, and send one
more revision.

Thanks,
Stefan
diff mbox

Patch

--- 082.out	2014-03-14 15:15:20.187691443 +0100
+++ 082.out.bad	2014-03-14 16:57:36.321417402 +0100
@@ -64,7 +64,7 @@ 
 backing_fmt      Image format of the base image
 encryption       Encrypt the image
 cluster_size     qcow2 cluster size
-preallocation    Preallocation mode (allowed values: off, metadata)
+preallocation    Preallocation mode (allowed values: off, metadata, full)
 lazy_refcounts   Postpone refcount updates
 
 Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M