Merge pull request #4274 from qingwangrh/3448_iommu_improvement

block_with_iommu: improve test case

Author: XueqiangWei

qemu/tests/block_with_iommu.py

@@ -1,4 +1,5 @@
 import re
+import time
 
 from virttest import cpu, error_context
 
@@ -57,14 +58,29 @@ def verify_iommu_enabled():
         test.cancel("This case only support Intel platform.")
 
     vm = env.get_vm(params["main_vm"])
-    vm.verify_alive()
-    session = vm.wait_for_login(timeout=360)
-    verify_iommu_enabled()
+    logger = test.log
+    try:
+        logger.debug("Test Start")
+        vm.verify_alive()
+        session = vm.wait_for_login(timeout=360)
+        verify_iommu_enabled()
+        time.sleep(30)
+        logger.debug("Execute IO CMD")
+        session.cmd(params.get("dd_cmd"))
 
-    session.cmd(params.get("dd_cmd"))
-
-    if params.get("reload_kernel_cmd"):
-        reload_kernel(session)
-
-    session = vm.reboot(session, timeout=360)
-    session.cmd(params.get("dd_cmd"))
+        if params.get("reload_kernel_cmd"):
+            logger.debug("reload_kernel")
+            reload_kernel(session)
+        logger.debug("Before reboot")
+        session = vm.reboot(session, timeout=180)
+        logger.debug("Execute IO CMD after reboot")
+        session.cmd(params.get("dd_cmd"))
+        logger.debug("Test over")
+    finally:
+        logger.debug("Destroy VM ...")
+        vm.monitors = []
+        vm.destroy(gracefully=False)
+        logger.debug("Destroy VM End")
+        params["enable_guest_iommu"] = "no"
+        env.unregister_vm(params["main_vm"])
+        logger.debug("Finally block over ")

qemu/tests/cfg/block_with_iommu.cfg

@@ -8,12 +8,14 @@
     enable_guest_iommu = yes
     virtio_dev_ats = on
     machine_type_extra_params = "kernel-irqchip=split"
+    clone_master = yes
+    master_images_clone = image1
+    remove_image_image1 = yes
     variants:
         - verify_enabled:
             only Linux
             no RHEL.7
             no Host_RHEL.m7
-            only virtio_scsi
             virtio_dev_disable_legacy = on
             virtio_dev_disable_modern = off
             check_key_words = "DMAR: IOMMU enabled;"
@@ -22,9 +24,6 @@
             variants:
                 - @default:
                 - reload_kernel:
-                    clone_master = yes
-                    master_images_clone = image1
-                    remove_image_image1 = yes
                     force_reset_go_down_check = shell
                     reload_kernel_cmd = 'kexec -l /boot/%s --initrd=/boot/%s --command-line="%s"'
                     cmd_get_kernel_ver = uname -r