From patchwork Tue Mar 29 15:03:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 8687941 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 9C62DC0553 for ; Tue, 29 Mar 2016 15:04:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1C3D20103 for ; Tue, 29 Mar 2016 15:04:17 +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 6B3D92010C for ; Tue, 29 Mar 2016 15:04:16 +0000 (UTC) Received: from localhost ([::1]:47613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvBn-00049u-Pi for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Mar 2016 11:04:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvBb-00046h-9p for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:04:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akvBZ-0004eC-RP for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:04:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvBS-0004a9-83; Tue, 29 Mar 2016 11:03:54 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id DD3057822D; Tue, 29 Mar 2016 15:03:53 +0000 (UTC) Received: from localhost (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2TF3qb5006692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 29 Mar 2016 11:03:53 -0400 From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 29 Mar 2016 17:03:43 +0200 Message-Id: <1459263823-18102-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1459263823-18102-1-git-send-email-mreitz@redhat.com> References: <1459263823-18102-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Subject: [Qemu-devel] [PATCH v3 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. Signed-off-by: Max Reitz --- tests/qemu-iotests/150 | 74 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/150.out | 11 +++++++ tests/qemu-iotests/group | 1 + 3 files changed, 86 insertions(+) create mode 100755 tests/qemu-iotests/150 create mode 100644 tests/qemu-iotests/150.out diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 new file mode 100755 index 0000000..665373d --- /dev/null +++ b/tests/qemu-iotests/150 @@ -0,0 +1,74 @@ +#!/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 raw qcow2 +_supported_proto file +_supported_os Linux + + +img_size=1048576 + + +echo +echo '=== Mapping sparse conversion ===' +echo + +$QEMU_IMG_PROG convert -O "$IMGFMT" -S 512 \ + "json:{ 'driver': 'null-co', 'size': $img_size, 'read-zeroes': true }" \ + "$TEST_IMG" + +$QEMU_IMG map "$TEST_IMG" | _filter_qemu_img_map + + +echo +echo '=== Mapping non-sparse conversion ===' +echo + +$QEMU_IMG convert -O "$IMGFMT" -S 0 \ + "json:{ 'driver': 'null-co', 'size': $img_size, 'read-zeroes': true }" \ + "$TEST_IMG" + +$QEMU_IMG map "$TEST_IMG" | _filter_qemu_img_map + + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/150.out b/tests/qemu-iotests/150.out new file mode 100644 index 0000000..2a54e8d --- /dev/null +++ b/tests/qemu-iotests/150.out @@ -0,0 +1,11 @@ +QA output created by 150 + +=== Mapping sparse conversion === + +Offset Length File + +=== Mapping non-sparse conversion === + +Offset Length File +0 0x100000 TEST_DIR/t.IMGFMT +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 92ae8ec..2952b9d 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -151,3 +151,4 @@ 146 auto quick 148 rw auto quick 149 rw auto sudo +150 rw auto quick