Merge pull request #2221 from huangyum/unplug

hotplug_mem: Refine test cases about memory unplug

qemu/tests/cfg/hotplug_mem.cfg

@@ -30,16 +30,18 @@
             prealloc_mem = yes
             share_mem = yes
             discard-data = yes
-            only one
+            only two
             only no_policy
+            only pluged_memory
         - op_off:
             dump_mem = no
             merge_mem = no
             prealloc_mem = no
             share_mem = no
             discard-data = no
-            only one
+            only two
             only no_policy
+            only pluged_memory
     variants numa_nodes:
         - one:
             guest_numa_nodes = "node0"
@@ -105,13 +107,18 @@
                 - buildin_memory:
                     mem_devs += " buildin"
                     target_mems = "buildin"
+                    only pause_vm
+                    only during
                 - pluged_memory:
                     plug_mem = "plug"
                     target_mems = "plug"
+                    no during.pause_vm
                 - unused_memory:
                     target_mems = "unused"
                     mem_devs += " ${target_mems}"
                     use_mem_unused = no
+                    only guest_reboot
+                    only after
         - hotplug:
             target_mems = "plug1 plug2"
     variants sub_test:
@@ -119,11 +126,14 @@
             sub_type = boot
             reboot_method = system_reset
             sleep_before_reset = 0
+            no during
+            only backend_ram.policy_default backend_file.policy_bind
         - guest_reboot:
             sub_type = boot
             reboot_method = shell
             kill_vm_on_error = yes
             reboot_count = 1
+            no during
         - guest_migration:
             sub_type = migration
             max_vms = 2
@@ -146,9 +156,10 @@
             only after
         - pause_vm:
             sub_type = stop_continue
-            pause_time = 300
+            pause_time = 10
             wait_resume_timeout = "${pause_time}"
-            sub_test_wait_time = 60
+            sub_test_wait_time = 10
+            only backend_ram.policy_bind backend_file.policy_default
         - stress:
             sub_test_wait_time = 60
             Windows:
@@ -167,6 +178,7 @@
             Linux:
                 sub_type = linux_stress
                 test_timeout = 1800
+            only backend_ram.policy_default backend_file.policy_bind
     variants stage:
         - before:
         - after: