9ae3a8
From 762c6ae0424c3389e432ea40d2559abac2eb3566 Mon Sep 17 00:00:00 2001
9ae3a8
From: Max Reitz <mreitz@redhat.com>
9ae3a8
Date: Sun, 29 Dec 2013 22:06:57 +0100
9ae3a8
Subject: [PATCH 6/8] qemu-iotests: Adjust test result 039
9ae3a8
9ae3a8
RH-Author: Max Reitz <mreitz@redhat.com>
9ae3a8
Message-id: <1388354817-3013-6-git-send-email-mreitz@redhat.com>
9ae3a8
Patchwork-id: 56447
9ae3a8
O-Subject: [RHEL-7.0 qemu-kvm PATCH 5/5] qemu-iotests: Adjust test result 039
9ae3a8
Bugzilla: 1004347
9ae3a8
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
9ae3a8
RH-Acked-by: Fam Zheng <famz@redhat.com>
9ae3a8
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
9ae3a8
9ae3a8
BZ: 1004347
9ae3a8
9ae3a8
The moved OFLAG_COPIED check in qcow2_check_refcounts results in a
9ae3a8
different output from test 039 (mismatches are now found after the
9ae3a8
general refcount check (as far as any remain)). This patch adjusts the
9ae3a8
expected test result accordingly.
9ae3a8
9ae3a8
Signed-off-by: Max Reitz <mreitz@redhat.com>
9ae3a8
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
9ae3a8
(cherry picked from commit b3f3a30f387f34308b3e4d910a2824e69c34182f)
9ae3a8
9ae3a8
Signed-off-by: Max Reitz <mreitz@redhat.com>
9ae3a8
---
9ae3a8
 tests/qemu-iotests/039.out | 4 +---
9ae3a8
 1 file changed, 1 insertion(+), 3 deletions(-)
9ae3a8
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
---
9ae3a8
 tests/qemu-iotests/039.out |    4 +---
9ae3a8
 1 files changed, 1 insertions(+), 3 deletions(-)
9ae3a8
9ae3a8
diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
9ae3a8
index cb510d6..077fa64 100644
9ae3a8
--- a/tests/qemu-iotests/039.out
9ae3a8
+++ b/tests/qemu-iotests/039.out
9ae3a8
@@ -12,8 +12,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
9ae3a8
 wrote 512/512 bytes at offset 0
9ae3a8
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
9ae3a8
 incompatible_features     0x1
9ae3a8
-ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0
9ae3a8
 ERROR cluster 5 refcount=0 reference=1
9ae3a8
+ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
9ae3a8
 
9ae3a8
 2 errors were found on the image.
9ae3a8
 Data may be corrupted, or further writes to the image may corrupt it.
9ae3a8
@@ -24,7 +24,6 @@ read 512/512 bytes at offset 0
9ae3a8
 incompatible_features     0x1
9ae3a8
 
9ae3a8
 == Repairing the image file must succeed ==
9ae3a8
-ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0
9ae3a8
 Repairing cluster 5 refcount=0 reference=1
9ae3a8
 The following inconsistencies were found and repaired:
9ae3a8
 
9ae3a8
@@ -44,7 +43,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
9ae3a8
 wrote 512/512 bytes at offset 0
9ae3a8
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
9ae3a8
 incompatible_features     0x1
9ae3a8
-ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0
9ae3a8
 Repairing cluster 5 refcount=0 reference=1
9ae3a8
 wrote 512/512 bytes at offset 0
9ae3a8
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
9ae3a8
-- 
9ae3a8
1.7.1
9ae3a8