Merge pull request #1549 from huangyum/memhp_mig

hotplug_mem: fix hugepage issue for migration case

qemu/tests/cfg/hotplug_mem.cfg

@@ -65,14 +65,17 @@
         - policy_bind:
             policy_mem = bind
             host-nodes = 0
+            target_nodes = 0
         - policy_interleave:
             policy_mem = interleave
             host-nodes = 0
+            target_nodes = 0
             only guest_reboot
             only after
         - policy_preferred:
             policy_mem = preferred
             host-nodes = 0
+            target_nodes = 0
             only guest_reboot
             only after
         - no_policy:
@@ -94,28 +97,6 @@
             mem-path = /mnt/kvm_hugepage
             pre_command = "echo 3 > /proc/sys/vm/drop_caches"
             pre_command_noncritical = yes
-            variants:
-                - 2M_hugepage:
-                    # default pagesize is 2M, 2G guest memory need to allocate
-                    # in hugepage, so page nubmer is:
-                    #    target_hugepages = (size_mem / page_size) * 2 + 10
-                    target_hugepages = 2058
-                    expected_hugepage_size = 2048
-                - 16M_hugepage:
-                    only pseries
-                    target_hugepages = 266
-                    expected_hugepage_size = 16384
-                - 1G_hugepage:
-                    # Warning:
-                    #     Please don't forget to update host kernel line to enable
-                    # 1G hugepage support before lanuch this test, else test will
-                    # failed.
-                    target_hugepages = 5
-                    expected_hugepage_size = 1048576
-                    only one
-                    only guest_reboot
-                    only no_policy
-                    no pseries
     variants operation:
         - unplug:
             no Windows
@@ -145,6 +126,7 @@
             reboot_count = 1
         - guest_migration:
             sub_type = migration
+            max_vms = 2
             Linux:
                 migration_test_command = help
                 migration_bg_command = "cd /tmp; nohup tcpdump -q -i any -t ip host localhost"