|
 |
1bdc94 |
From 9cc4ecc4169dc8a8636a1ddc8dbe454a274e1432 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 29 Jun 2018 06:11:51 +0200
|
|
|
1bdc94 |
Subject: [PATCH 47/57] qcow2: Fix src_offset in copy offloading
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180629061153.12687-12-famz@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81163
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH v2 11/13] qcow2: Fix src_offset in copy offloading
|
|
|
1bdc94 |
Bugzilla: 1482537
|
|
|
1bdc94 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Not updating src_offset will result in wrong data being written to dst
|
|
|
1bdc94 |
image.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Reported-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
block/qcow2.c | 1 +
|
|
|
1bdc94 |
tests/qemu-iotests/063 | 9 +++++++++
|
|
|
1bdc94 |
tests/qemu-iotests/063.out | 12 ++++++++++++
|
|
|
1bdc94 |
3 files changed, 22 insertions(+)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
1bdc94 |
index c85ebcb..4404dc7 100644
|
|
|
1bdc94 |
--- a/block/qcow2.c
|
|
|
1bdc94 |
+++ b/block/qcow2.c
|
|
|
1bdc94 |
@@ -3416,6 +3416,7 @@ qcow2_co_copy_range_to(BlockDriverState *bs,
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
bytes -= cur_bytes;
|
|
|
1bdc94 |
+ src_offset += cur_bytes;
|
|
|
1bdc94 |
dst_offset += cur_bytes;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
ret = 0;
|
|
|
1bdc94 |
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
|
|
|
1bdc94 |
index e4f6ea9..adc037c 100755
|
|
|
1bdc94 |
--- a/tests/qemu-iotests/063
|
|
|
1bdc94 |
+++ b/tests/qemu-iotests/063
|
|
|
1bdc94 |
@@ -91,6 +91,15 @@ if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev
|
|
|
1bdc94 |
exit 1
|
|
|
1bdc94 |
fi
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+echo "== Regression testing for copy offloading bug =="
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+_make_test_img 1M
|
|
|
1bdc94 |
+TEST_IMG="$TEST_IMG.target" _make_test_img 1M
|
|
|
1bdc94 |
+$QEMU_IO -c 'write -P 1 0 512k' -c 'write -P 2 512k 512k' "$TEST_IMG" | _filter_qemu_io
|
|
|
1bdc94 |
+$QEMU_IO -c 'write -P 4 512k 512k' -c 'write -P 3 0 512k' "$TEST_IMG.target" | _filter_qemu_io
|
|
|
1bdc94 |
+$QEMU_IMG convert -n -O $IMGFMT "$TEST_IMG" "$TEST_IMG.target"
|
|
|
1bdc94 |
+$QEMU_IMG compare "$TEST_IMG" "$TEST_IMG.target"
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
echo "*** done"
|
|
|
1bdc94 |
rm -f $seq.full
|
|
|
1bdc94 |
status=0
|
|
|
1bdc94 |
diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
|
|
|
1bdc94 |
index de1c99a..7b691b2 100644
|
|
|
1bdc94 |
--- a/tests/qemu-iotests/063.out
|
|
|
1bdc94 |
+++ b/tests/qemu-iotests/063.out
|
|
|
1bdc94 |
@@ -7,4 +7,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
|
|
|
1bdc94 |
No errors were found on the image.
|
|
|
1bdc94 |
== Testing conversion to a smaller file fails ==
|
|
|
1bdc94 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
|
|
|
1bdc94 |
+== Regression testing for copy offloading bug ==
|
|
|
1bdc94 |
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
|
|
|
1bdc94 |
+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
|
|
|
1bdc94 |
+wrote 524288/524288 bytes at offset 0
|
|
|
1bdc94 |
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
1bdc94 |
+wrote 524288/524288 bytes at offset 524288
|
|
|
1bdc94 |
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
1bdc94 |
+wrote 524288/524288 bytes at offset 524288
|
|
|
1bdc94 |
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
1bdc94 |
+wrote 524288/524288 bytes at offset 0
|
|
|
1bdc94 |
+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
1bdc94 |
+Images are identical.
|
|
|
1bdc94 |
*** done
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|