[Qemu-devel] [PATCH] qemu-iotests: Adjust test result 039

[Qemu-devel] [PATCH] qemu-iotests: Adjust test result 039

[Max Reitz]

The moved OFLAG_COPIED check in qcow2_check_refcounts results in a
different output from test 039 (mismatches are now found after the
general refcount check (as far as any remain)). This patch adjusts the
expected test result accordingly.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
Follow-up to:
 - Add metadata overlap checks (series, v5); particularly patch 4
   (qcow2-refcount: Move OFLAG_COPIED checks)
---
 tests/qemu-iotests/039.out | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
index cb510d6..077fa64 100644
--- a/tests/qemu-iotests/039.out
+++ b/tests/qemu-iotests/039.out
@@ -12,8 +12,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 incompatible_features     0x1
-ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0
 ERROR cluster 5 refcount=0 reference=1
+ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
 
 2 errors were found on the image.
 Data may be corrupted, or further writes to the image may corrupt it.
@@ -24,7 +24,6 @@ read 512/512 bytes at offset 0
 incompatible_features     0x1
 
 == Repairing the image file must succeed ==
-ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0
 Repairing cluster 5 refcount=0 reference=1
 The following inconsistencies were found and repaired:
 
@@ -44,7 +43,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 incompatible_features     0x1
-ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0
 Repairing cluster 5 refcount=0 reference=1
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] qemu-iotests: Adjust test result 039

[Stefan Hajnoczi]

On Mon, Sep 02, 2013 at 04:36:15PM +0200, Max Reitz wrote:
> The moved OFLAG_COPIED check in qcow2_check_refcounts results in a
> different output from test 039 (mismatches are now found after the
> general refcount check (as far as any remain)). This patch adjusts the
> expected test result accordingly.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> Follow-up to:
>  - Add metadata overlap checks (series, v5); particularly patch 4
>    (qcow2-refcount: Move OFLAG_COPIED checks)
> ---
>  tests/qemu-iotests/039.out | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan