From patchwork Wed Feb 24 00:47:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Cody X-Patchwork-Id: 587148 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 8C889140662 for ; Wed, 24 Feb 2016 11:49:48 +1100 (AEDT) Received: from localhost ([::1]:60811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYNeD-0004TJ-4M for incoming@patchwork.ozlabs.org; Tue, 23 Feb 2016 19:49:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYNcj-0001we-49 for qemu-devel@nongnu.org; Tue, 23 Feb 2016 19:48:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYNch-0004Zw-8L for qemu-devel@nongnu.org; Tue, 23 Feb 2016 19:48:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYNcc-0004Xo-9P; Tue, 23 Feb 2016 19:48:06 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id DE9151E5D; Wed, 24 Feb 2016 00:48:05 +0000 (UTC) Received: from localhost (ovpn-112-42.phx2.redhat.com [10.3.112.42]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1O0m48A000695 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA256 bits=256 verify=NO); Tue, 23 Feb 2016 19:48:05 -0500 From: Jeff Cody To: qemu-block@nongnu.org Date: Tue, 23 Feb 2016 19:47:56 -0500 Message-Id: <4a7fc43138fff7dfbebfaf993835b315ea50d01b.1456274059.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pl@kamp.de, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/4] block/vpc: tests for auto-detecting VPC and Hyper-V VHD images 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 This tests auto-detection, and overrides, of VHD image sizes created by Virtual PC and Hyper-V. This adds two sample images: hyperv2012r2-dynamic.vhd.bz2 - dynamic VHD image created with Hyper-V virtualpc-dynamic.vhd.bz2 - dynamic VHD image created with Virtual PC Signed-off-by: Jeff Cody --- tests/qemu-iotests/146 | 119 +++++++++++++++++++++ tests/qemu-iotests/146.out | 38 +++++++ tests/qemu-iotests/group | 1 + .../sample_images/hyperv2012r2-dynamic.vhd.bz2 | Bin 0 -> 214 bytes .../sample_images/virtualpc-dynamic.vhd.bz2 | Bin 0 -> 212 bytes 5 files changed, 158 insertions(+) create mode 100755 tests/qemu-iotests/146 create mode 100644 tests/qemu-iotests/146.out create mode 100644 tests/qemu-iotests/sample_images/hyperv2012r2-dynamic.vhd.bz2 create mode 100644 tests/qemu-iotests/sample_images/virtualpc-dynamic.vhd.bz2 diff --git a/tests/qemu-iotests/sample_images/hyperv2012r2-dynamic.vhd.bz2 b/tests/qemu-iotests/sample_images/hyperv2012r2-dynamic.vhd.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..bfeccf7b9f2596f119bb35d7e650a29f8e6f17ef GIT binary patch literal 214 zcmV;{04e`MT4*^jL0KkKS<7>@aR2~j|Ns3EPyxUK5D)+a0HCTX+~fcS06+jB01!Yx z0Eqx02&u3Dw$>7=8feLprXhl8!7=I+01-+c00006fB?`)si-s!00E((0ieW+9LW!< z$bjJjeWx)DFnA{B7q@4*a;xX z24}+|;{k09^toeVF+M+y8lDaaN{P?GVI@TYSp=OSB$8;1RzUy&6`?NT5C8<(0ssS^ Oh1`)&6eJCs&V_&uMoJF= literal 0 HcmV?d00001 diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 new file mode 100755 index 0000000..af60849 --- /dev/null +++ b/tests/qemu-iotests/146 @@ -0,0 +1,119 @@ +#!/bin/bash +# +# Test VHD image format creator detection and override +# +# 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=jcody@redhat.com + +seq=`basename $0` +echo "QA output created by $seq" + +here=`pwd` +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_qemu + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.qemu + +_supported_fmt vpc +_supported_proto file +_supported_os Linux + + +qemu_comm_method="monitor" +silent= + +echo +echo === Testing VPC Autodetect === +echo +_use_sample_img virtualpc-dynamic.vhd.bz2 + +_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc +h1=$QEMU_HANDLE + +_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors" +_send_qemu_cmd $h1 'quit' "" + +echo +echo === Testing VPC with current_size force === +echo + +_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc,force_size_calc=current_size +h1=$QEMU_HANDLE + +_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors" +_send_qemu_cmd $h1 'quit' "" + +echo +echo === Testing VPC with chs force === +echo + +_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc,force_size_calc=chs +h1=$QEMU_HANDLE + +_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors" +_send_qemu_cmd $h1 'quit' "" + + +_cleanup_test_img + +echo +echo === Testing Hyper-V Autodetect === +echo +_use_sample_img hyperv2012r2-dynamic.vhd.bz2 + +_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc +h1=$QEMU_HANDLE + +_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors" +_send_qemu_cmd $h1 'quit' "" + +echo +echo === Testing Hyper-V with current_size force === +echo + +_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc,force_size_calc=current_size +h1=$QEMU_HANDLE + +_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors" +_send_qemu_cmd $h1 'quit' "" + +echo +echo === Testing Hyper-V with chs force === +echo + +_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc,force_size_calc=chs +h1=$QEMU_HANDLE + +_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors" +_send_qemu_cmd $h1 'quit' "" + + + +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..ddcfeb6 --- /dev/null +++ b/tests/qemu-iotests/146.out @@ -0,0 +1,38 @@ +QA output created by 146 + +=== Testing VPC Autodetect === + +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io diqemu-io disqemu-io diskqemu-io disk qemu-io disk "qemu-io disk "mqemu-io disk "maqemu-io disk "mapqemu-io disk "map" +[ 0] 266334240/ 266334240 sectors not allocated at offset 0 bytes (0) + +=== Testing VPC with current_size force === + +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io diqemu-io disqemu-io diskqemu-io disk qemu-io disk "qemu-io disk "mqemu-io disk "maqemu-io disk "mapqemu-io disk "map" +[ 0] 266338304/ 266338304 sectors not allocated at offset 0 bytes (0) + +=== Testing VPC with chs force === + +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io diqemu-io disqemu-io diskqemu-io disk qemu-io disk "qemu-io disk "mqemu-io disk "maqemu-io disk "mapqemu-io disk "map" +[ 0] 266334240/ 266334240 sectors not allocated at offset 0 bytes (0) + +=== Testing Hyper-V Autodetect === + +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io diqemu-io disqemu-io diskqemu-io disk qemu-io disk "qemu-io disk "mqemu-io disk "maqemu-io disk "mapqemu-io disk "map" +[ 0] 266338304/ 266338304 sectors not allocated at offset 0 bytes (0) + +=== Testing Hyper-V with current_size force === + +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io diqemu-io disqemu-io diskqemu-io disk qemu-io disk "qemu-io disk "mqemu-io disk "maqemu-io disk "mapqemu-io disk "map" +[ 0] 266338304/ 266338304 sectors not allocated at offset 0 bytes (0) + +=== Testing Hyper-V with chs force === + +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io diqemu-io disqemu-io diskqemu-io disk qemu-io disk "qemu-io disk "mqemu-io disk "maqemu-io disk "mapqemu-io disk "map" +[ 0] 266334240/ 266334240 sectors not allocated at offset 0 bytes (0) +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 47fd40c..1211149 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -148,3 +148,4 @@ 143 auto quick 144 rw auto quick 145 auto quick +146 auto quick