From patchwork Mon Dec 15 08:27:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 421025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0DDF21400D2 for ; Mon, 15 Dec 2014 20:18:36 +1100 (AEDT) Received: from localhost ([::1]:38622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0RnV-0004Cw-VJ for incoming@patchwork.ozlabs.org; Mon, 15 Dec 2014 04:18:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0Rg4-00080Y-Kc for qemu-devel@nongnu.org; Mon, 15 Dec 2014 04:10:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0Rfz-0005e1-Ms for qemu-devel@nongnu.org; Mon, 15 Dec 2014 04:10:52 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:27462 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0Rfz-0004kT-9M for qemu-devel@nongnu.org; Mon, 15 Dec 2014 04:10:47 -0500 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id sBF8RAUO012492; Mon, 15 Dec 2014 12:27:32 +0400 (MSK) From: "Denis V. Lunev" To: Date: Mon, 15 Dec 2014 11:27:57 +0300 Message-Id: <1418632081-20667-13-git-send-email-den@openvz.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418632081-20667-1-git-send-email-den@openvz.org> References: <1418632081-20667-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Kevin Wolf , Roman Kagan , Jeff Cody , qemu-devel@nongnu.org, Stefan Hajnoczi , "Denis V. Lunev" Subject: [Qemu-devel] [PATCH 12/16] iotests: testcase for backing in parallels format X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Roman Kagan This patch adds a testcase for reading from a backing file when both the current image and the backing one are in parallels format. Signed-off-by: Roman Kagan Signed-off-by: Denis V. Lunev CC: Jeff Cody CC: Kevin Wolf CC: Stefan Hajnoczi --- tests/qemu-iotests/076 | 21 +++++++++++++++++++++ tests/qemu-iotests/076.out | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index 766b359..04b359b 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -31,6 +31,11 @@ status=1 # failure is the default! _cleanup() { _cleanup_test_img + + if [ -n "$TEST_IMG_BASE" ] + then + rm -f "$TEST_IMG_BASE" + fi } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -87,6 +92,22 @@ _use_sample_img parallels-v2-padded.bz2 _use_sample_img parallels-padded.xml.bz2 { $QEMU_IO -c "read -P 0x11 0 64k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +echo +echo "== Read from an image with a backing image ==" +TEST_IMG_BASE="$TEST_IMG.base" +_use_sample_img parallels-v1.bz2 +mv -f "$TEST_IMG" "$TEST_IMG_BASE" +dd if="$TEST_IMG_BASE" of="$TEST_IMG" bs=64 count=1 &>/dev/null +dd if=/dev/zero of="$TEST_IMG" bs=1M count=0 seek=1 conv=notrunc &>/dev/null +{ $QEMU_IO -c "read -P 0x11 0 64k" \ + "json:{ + \"file\": {\"filename\": \"$TEST_IMG\"}, + \"backing\":{ + \"file\":{\"filename\":\"$TEST_IMG_BASE\"}, + \"driver\":\"parallels\" + } + }"; } 2>&1 | _filter_qemu_io | _filter_testdir + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out index 46680d8..0cce00c 100644 --- a/tests/qemu-iotests/076.out +++ b/tests/qemu-iotests/076.out @@ -27,4 +27,8 @@ read 65536/65536 bytes at offset 0 == Read from a valid v2 image opened through xml with padding == read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +== Read from an image with a backing image == +read 65536/65536 bytes at offset 0 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done