Merge pull request #592 from zhouqt/minor-fix

qemu: Minor fixes for qemu test cases

qemu/tests/cfg/multi_disk.cfg

@@ -23,6 +23,7 @@
             cdroms = ""
             ide:
                 # 3 + boot disk = 4 disks
+                image_extra_params = ""
                 stg_image_num = 3
                 stg_params  = "image_size:1G,10G,5G "
                 stg_params += "image_format:qcow2,qcow2,raw "

tests/boot_savevm.py

@@ -34,9 +34,9 @@ def run_boot_savevm(test, params, env):
         vm.create(params=params)
 
     vm.verify_alive() # This shouldn't require logging in to guest
-    savevm_delay = float(params.get("savevm_delay"))
-    savevm_login_delay = float(params.get("savevm_login_delay"))
-    savevm_login_timeout = float(params.get("savevm_timeout"))
+    savevm_delay = float(params["savevm_delay"])
+    savevm_login_delay = float(params["savevm_login_delay"])
+    savevm_login_timeout = float(params["savevm_timeout"])
     savevm_statedir = params.get("savevm_statedir", tempfile.gettempdir())
     fd, savevm_statefile = tempfile.mkstemp(suffix='.img', prefix=vm.name+'-',
                                             dir=savevm_statedir)

tests/cfg/block_hotplug.cfg

@@ -16,10 +16,12 @@
     kill_vm_on_error = yes
     variants:
         - fmt_qcow2:
+            image_extra_params = ""
             image_format_stg = qcow2
             image_format_stg0 = qcow2
             image_format_stg1 = qcow2
         - fmt_raw:
+            image_extra_params = ""
             image_format_stg = raw
             image_format_stg0 = raw
             image_format_stg1 = raw

tests/cfg/guest_suspend.cfg

@@ -44,7 +44,7 @@
             type = clock_getres
             sub_test = guest_suspend
         - without_kvmclock:
-            cpu_model_flags += " -kvmclock"
+            cpu_model_flags += ",-kvmclock"
     variants:
         - guest_s3:
             guest_suspend_type = "mem"

tests/cfg/whql.cfg

@@ -203,6 +203,7 @@
                 - block_device:
                     image_snapshot = yes
                     images += " stg stg2 stg3 stg4"
+                    image_extra_params = ""
                     image_format_stg = raw
                     image_name_stg = images/storage
                     image_size_stg = 2G