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