From patchwork Mon Apr 15 15:17:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 236634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 99EA82C00F3 for ; Tue, 16 Apr 2013 01:18:38 +1000 (EST) Received: from localhost ([::1]:49662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URlAy-0003LF-Nb for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 11:18:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URlAN-0003BM-JZ for qemu-devel@nongnu.org; Mon, 15 Apr 2013 11:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URlAJ-0006vw-Tb for qemu-devel@nongnu.org; Mon, 15 Apr 2013 11:17:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URlAJ-0006vl-LY for qemu-devel@nongnu.org; Mon, 15 Apr 2013 11:17:55 -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 (8.14.4/8.14.4) with ESMTP id r3FFHrXR005787 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 15 Apr 2013 11:17:53 -0400 Received: from localhost (ovpn-112-34.ams2.redhat.com [10.36.112.34]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3FFHqWq005713; Mon, 15 Apr 2013 11:17:53 -0400 From: Stefan Hajnoczi To: Date: Mon, 15 Apr 2013 17:17:34 +0200 Message-Id: <1366039054-32536-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1366039054-32536-1-git-send-email-stefanha@redhat.com> References: <1366039054-32536-1-git-send-email-stefanha@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 , Fam Zheng , Ilkka Tengvall , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 4/4] qemu-iotests: add 053 unaligned compressed image size test 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 Test that qemu-img convert -c works when input image length is not a multiple of the cluster size. Previously an error message would be produced: qemu-img: error while compressing sector 0: Input/output error Now that qcow2 and qcow handle this case the test passes successfully. Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/053 | 63 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/053.out | 10 ++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 74 insertions(+) create mode 100755 tests/qemu-iotests/053 create mode 100644 tests/qemu-iotests/053.out diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 new file mode 100755 index 0000000..45d846c --- /dev/null +++ b/tests/qemu-iotests/053 @@ -0,0 +1,63 @@ +#!/bin/bash +# +# Test qemu-img convert when image length is not a multiple of cluster size +# +# Copyright (C) 2013 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=stefanha@redhat.com + +seq=`basename $0` +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! + +_cleanup() +{ + rm -f $TEST_IMG.orig + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +_supported_fmt qcow2 qcow +_supported_proto file +_supported_os Linux + +echo +echo "== Creating single sector image ==" + +_make_test_img 512 +$QEMU_IO -c "write -P0xa 0 512" $TEST_IMG | _filter_qemu_io +mv $TEST_IMG $TEST_IMG.orig + +echo +echo "== Converting the image, compressed ==" + +$QEMU_IMG convert -c -O $IMGFMT $TEST_IMG.orig $TEST_IMG +_check_test_img + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 + diff --git a/tests/qemu-iotests/053.out b/tests/qemu-iotests/053.out new file mode 100644 index 0000000..1c96b6b --- /dev/null +++ b/tests/qemu-iotests/053.out @@ -0,0 +1,10 @@ +QA output created by 053 + +== Creating single sector image == +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=512 +wrote 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +== Converting the image, compressed == +No errors were found on the image. +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 73c5966..2fba9a4 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -58,3 +58,4 @@ 049 rw auto 050 rw auto backing quick 052 rw auto backing +053 rw auto