From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1tHp-0001vM-WE for qemu-devel@nongnu.org; Thu, 26 Nov 2015 04:56:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1tHm-0005S6-Nv for qemu-devel@nongnu.org; Thu, 26 Nov 2015 04:56:21 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:59545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1tHl-0005Rq-Nk for qemu-devel@nongnu.org; Thu, 26 Nov 2015 04:56:18 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Nov 2015 15:26:14 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 3076A125805D for ; Thu, 26 Nov 2015 15:26:27 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tAQ9rPfv34078726 for ; Thu, 26 Nov 2015 15:23:25 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tAQ9rPgJ008211 for ; Thu, 26 Nov 2015 15:23:25 +0530 From: Bo Tu Date: Thu, 26 Nov 2015 17:53:14 +0800 Message-Id: <1448531594-27192-4-git-send-email-tubo@linux.vnet.ibm.com> In-Reply-To: <1448531594-27192-1-git-send-email-tubo@linux.vnet.ibm.com> References: <1448531594-27192-1-git-send-email-tubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 3/3] qemu-iotests: s390x: fix test 068 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, silbe@linux.vnet.ibm.com, mreitz@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.com From: Bo Tu 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. Acked-by: Max Reitz Reviewed-by: Sascha Silbe Signed-off-by: Bo Tu --- 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 -- 2.4.3