From patchwork Wed Nov 4 02:26:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bo Tu X-Patchwork-Id: 539679 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 CC9F7141330 for ; Wed, 4 Nov 2015 13:29:06 +1100 (AEDT) Received: from localhost ([::1]:52052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ztnou-0007rb-Cc for incoming@patchwork.ozlabs.org; Tue, 03 Nov 2015 21:29:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtnnC-0004gx-Ay for qemu-devel@nongnu.org; Tue, 03 Nov 2015 21:27:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ztnn9-0001hj-67 for qemu-devel@nongnu.org; Tue, 03 Nov 2015 21:27:18 -0500 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:52767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ztnn8-0001hE-F5 for qemu-devel@nongnu.org; Tue, 03 Nov 2015 21:27:15 -0500 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Nov 2015 07:57:12 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp06.in.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 4 Nov 2015 07:57:09 +0530 X-Helo: d28dlp01.in.ibm.com X-MailFrom: tubo@linux.vnet.ibm.com X-RcptTo: qemu-devel@nongnu.org Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 9C438E004C for ; Wed, 4 Nov 2015 07:57:25 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tA42R9F89175074 for ; Wed, 4 Nov 2015 07:57:09 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tA42R8Ys021395 for ; Wed, 4 Nov 2015 07:57:08 +0530 Received: from oc6333346435.ibm.com ([9.115.114.149]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id tA42R2Is021237; Wed, 4 Nov 2015 07:57:07 +0530 From: Bo Tu To: qemu-devel@nongnu.org Date: Wed, 4 Nov 2015 10:26:57 +0800 Message-Id: <1446604018-14025-4-git-send-email-tubo@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1446604018-14025-1-git-send-email-tubo@linux.vnet.ibm.com> References: <1446604018-14025-1-git-send-email-tubo@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15110402-0021-0000-0000-000008472154 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 122.248.162.6 Cc: kwolf@redhat.com, silbe@linux.vnet.ibm.com, mreitz@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2 3/4] qemu-iotests: s390x: fix test 068 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 Now, s390-virtio-ccw is default machine and s390-ccw.img is default boot loader. If the s390-virtio-ccw machine finds no device to load from and errors out, then emits a panic and exits the vm. This breaks test cases 068 for s390x. Adding the parameter of "-no-shutdown" for s390-ccw-virtio will pause VM before shutdown. Reviewed-by: Sascha Silbe Signed-off-by: Bo Tu Acked-by: Max Reitz --- tests/qemu-iotests/068 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index b72e555..58d1d80 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -50,13 +50,23 @@ echo echo "=== Saving and reloading a VM state to/from a qcow2 image ===" echo _make_test_img $IMG_SIZE + +case "$QEMU_DEFAULT_MACHINE" in + s390-ccw-virtio) + platform_parm="-no-shutdown -machine accel=kvm" + ;; + *) + platform_parm="" + ;; +esac + # Give qemu some time to boot before saving the VM state bash -c 'sleep 1; echo -e "savevm 0\nquit"' |\ - $QEMU -nographic -monitor stdio -serial none -hda "$TEST_IMG" |\ + $QEMU $platform_parm -nographic -monitor stdio -serial none -hda "$TEST_IMG" |\ _filter_qemu # Now try to continue from that VM state (this should just work) echo quit |\ - $QEMU -nographic -monitor stdio -serial none -hda "$TEST_IMG" -loadvm 0 |\ + $QEMU $platform_parm -nographic -monitor stdio -serial none -hda "$TEST_IMG" -loadvm 0 |\ _filter_qemu # success, all done