From patchwork Sat Feb 20 17:39:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 8367541 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4C1E5C0553 for ; Sat, 20 Feb 2016 17:40:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 676932034C for ; Sat, 20 Feb 2016 17:40:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 42FD42013A for ; Sat, 20 Feb 2016 17:40:28 +0000 (UTC) Received: from localhost ([::1]:34457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXBW7-0004Q3-Lc for patchwork-qemu-devel@patchwork.kernel.org; Sat, 20 Feb 2016 12:40:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXBVs-0004IO-5h for qemu-devel@nongnu.org; Sat, 20 Feb 2016 12:40:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXBVq-0000OJ-PG for qemu-devel@nongnu.org; Sat, 20 Feb 2016 12:40:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXBVo-0000Nc-1e; Sat, 20 Feb 2016 12:40:08 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 96C80C0CD16C; Sat, 20 Feb 2016 17:40:07 +0000 (UTC) Received: from localhost (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1KHe5DD008346 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 20 Feb 2016 12:40:06 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Sat, 20 Feb 2016 18:39:53 +0100 Message-Id: <1455989993-1917-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1455989993-1917-1-git-send-email-mreitz@redhat.com> References: <1455989993-1917-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Max Reitz Subject: [Qemu-devel] [PATCH 4/4] iotests: Test qemu-img convert -S 0 behavior 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Passing -S 0 to qemu-img convert should result in all source data being copied to the output, even if that source data is known to be 0. The output image should therefore have exactly the same size on disk as an image which we explicitly filled with data. Signed-off-by: Max Reitz --- tests/qemu-iotests/146 | 105 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/146.out | 14 ++++++ tests/qemu-iotests/group | 1 + 3 files changed, 120 insertions(+) create mode 100755 tests/qemu-iotests/146 create mode 100644 tests/qemu-iotests/146.out diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 new file mode 100755 index 0000000..611602e --- /dev/null +++ b/tests/qemu-iotests/146 @@ -0,0 +1,105 @@ +#!/bin/bash +# +# Test that qemu-img convert -S 0 fully allocates the target image +# +# Copyright (C) 2016 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=mreitz@redhat.com + +seq="$(basename $0)" +echo "QA output created by $seq" + +here="$PWD" +tmp=/tmp/$$ +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +_supported_fmt generic +_supported_proto file +_supported_os Linux + + +on_disk_size() +{ + du "$@" | sed -e 's/\t\+.*//' +} + + +img_size=1048576 + + +echo +echo '=== Comparing empty image against sparse conversion ===' +echo + +_make_test_img $img_size + +empty_size=$(on_disk_size "$TEST_IMG") + + +$QEMU_IMG_PROG convert -O "$IMGFMT" -S 512 \ + "json:{ 'driver': 'null-co', 'size': $img_size }" \ + "$TEST_IMG" + +sparse_convert_size=$(on_disk_size "$TEST_IMG") + + +if [ "$empty_size" -eq "$sparse_convert_size" ]; then + echo 'Equal image size' +else + echo 'Different image size' +fi + + +echo +echo '=== Comparing full image against non-sparse conversion ===' +echo + +_make_test_img $img_size +$QEMU_IO -c "write 0 $img_size" "$TEST_IMG" | _filter_qemu_io + +full_size=$(on_disk_size "$TEST_IMG") + + +$QEMU_IMG convert -O "$IMGFMT" -S 0 \ + "json:{ 'driver': 'null-co', 'size': $img_size }" \ + "$TEST_IMG" + +non_sparse_convert_size=$(on_disk_size "$TEST_IMG") + + +if [ "$full_size" -eq "$non_sparse_convert_size" ]; then + echo 'Equal image size' +else + echo 'Different image size' +fi + + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/146.out b/tests/qemu-iotests/146.out new file mode 100644 index 0000000..5464fba --- /dev/null +++ b/tests/qemu-iotests/146.out @@ -0,0 +1,14 @@ +QA output created by 146 + +=== Comparing empty image against sparse conversion === + +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 +Equal image size + +=== Comparing full image against non-sparse conversion === + +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 +wrote 1048576/1048576 bytes at offset 0 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Equal image size +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 65df029..524cd30 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -147,3 +147,4 @@ 142 auto 143 auto quick 144 rw auto quick +146 rw auto quick