Patchwork [v5,0/6] vmdk: zeroed-grain GTE support

login
register
mail settings
Submitter Stefan Hajnoczi
Date May 2, 2013, 3:05 p.m.
Message ID <20130502150522.GB989@stefanha-thinkpad.redhat.com>
Download mbox | patch
Permalink /patch/241030/
State New
Headers show

Comments

Stefan Hajnoczi - May 2, 2013, 3:05 p.m.
On Thu, May 02, 2013 at 10:25:21AM +0800, Fam Zheng wrote:
> Added support for zeroed-grain GTE to VMDK according to VMDK Spec 5.0[1].
> 
> [1] Virtual Disk Format 5.0 - VMware,
>     http://www.vmware.com/support/developer/vddk/vmdk_50_technote.pdf?src=vmdk
> 
> Changes since v4:
>  - 6/6: Correct endianess: *m_data->l2_cache_entry = offset;
> 
> 
> Changes since v3:
>  - 5/6: Remove tmp
>  - 6/6: Update L2 Cache
>         Remove redundant assignment to m_data
>         Simplify l2_offset assignment to m_data
>         Fix m_data.offset endian.
> 
> Changes since v2:
>  - all: Added 5/6 (vmdk: store fields of VmdkMetaData in cpu endian)
>  - 6/6: Avoid side-effect of vmdk_L2update.
>         Change function comment to gtkdoc stype.
>         Fix VMDK4_FLAG_ZG.
> 
> Changes since v1:
>  - all: fix From: field
>  - 1/5: squash one line of ret code macro change from 2/5
>  - 2/5: change VMDK4_FLAG_ZG to VMDK4_FLAG_ZERO_GRAIN
>  - 3/5: move BLOCK_OPT_ZEROED_GRAIN defination from block_int.h to vmdk.c
>  - 5/5: fix metadata update issue, unit test with cases 033 034
> 
> Fam Zheng (6):
>   vmdk: named return code.
>   vmdk: add support for “zeroed‐grain” GTE
>   vmdk: Add option to create zeroed-grain image
>   vmdk: change magic number to macro
>   vmdk: store fields of VmdkMetaData in cpu endian
>   vmdk: add bdrv_co_write_zeroes
> 
>  block/vmdk.c | 208 +++++++++++++++++++++++++++++++++++++++++------------------
>  1 file changed, 145 insertions(+), 63 deletions(-)

Patches look fine now.  The new option breaks qemu-iotests though:

$ cd tests/qemu-iotests
$ QEMU_PROG=$HOME/qemu/x86_64-softmmu/qemu-system-x86_64 \
  PATH=$HOME/qemu:$PATH \
  ./check -vmdk
[...]
001 1s ... - output mismatch (see 001.out.bad)
do this for other options.

Please send a patch to fix qemu-iotests so that I can apply this series.

Thanks,
Stefan

Patch

--- 001.out	2013-04-04 13:26:21.394050764 +0200
+++ 001.out.bad	2013-05-02 16:52:55.685803943 +0200
@@ -1,5 +1,5 @@ 
 QA output created by 001
 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 zeroed_grain=off

You'll need to filter out zeroed_grain from qemu-img output.  We already