Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

[mirror_qemu.git] / tests / qemu-iotests / 007

diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 0139264c4f1698264d4e1a79e047f0a2f7135e6a..fe1a743806e791b5ed08b57346a38faa9027dd43 100755 (executable)
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -30,7 +30,7 @@ status=1      # failure is the default!
 
 _cleanup()
 {
-#      _cleanup_test_img
+       _cleanup_test_img
        true
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -50,10 +50,9 @@ _make_test_img 1M
 
 for i in `seq 1 10`; do
     echo "savevm $i"
-    # XXX(hch): adding -nographic would be good, but hangs the test
-    $QEMU -hda $TEST_IMG -monitor stdio >/dev/null 2>&1 <<EOF     
-savevm test-$i                                                              
-quit                                                                        
+    $QEMU -nographic -hda "$TEST_IMG" -serial none -monitor stdio >/dev/null 2>&1 <<EOF
+savevm test-$i
+quit
 EOF
 done