Merge pull request #1383 from huangyum/hotplug_1578607

hotplug_mem: add new case to hotplug memory to different nodes

qemu/tests/cfg/hotplug_mem.cfg

@@ -52,11 +52,13 @@
             del numa_mem
             del numa_cpus
             numa_nodeid = 0
-            memdevs += " mem2"
+            mem_devs += " mem2"
             node_dimm_mem2 = 0
             node_dimm_mem1 = 1
             numa_nodeid_node0 = 0
             numa_nodeid_node1 = 1
+            node_dimm_plug1 = 0
+            node_dimm_plug2 = 1
     variants:
         - policy_default:
             policy_mem = default
@@ -120,16 +122,16 @@
             variants:
                 - buildin_memory:
                     mem_devs += " buildin"
-                    target_mem = "buildin"
+                    target_mems = "buildin"
                 - pluged_memory:
                     plug_mem = "plug"
-                    target_mem = "plug"
+                    target_mems = "plug"
                 - unused_memory:
-                    target_mem = "unused"
-                    mem_devs += " ${target_mem}"
+                    target_mems = "unused"
+                    mem_devs += " ${target_mems}"
                     use_mem_unused = no
         - hotplug:
-            target_mem = "plug"
+            target_mems = "plug1 plug2"
     variants sub_test:
         - vm_system_reset:
             sub_type = boot

qemu/tests/hotplug_mem.py

@@ -67,7 +67,7 @@ class MemoryHotplugSimple(MemoryHotplugTest):
 
     def start_test(self):
         operation = self.params["operation"]
-        target_mem = self.params["target_mem"]
+        target_mems = self.params["target_mems"]
         stage = self.params.get("stage", "before")
         sub_test_runner = (
             stage == 'during' and [
@@ -80,11 +80,13 @@ class MemoryHotplugSimple(MemoryHotplugTest):
         try:
             if stage != "after":
                 sub_test = sub_test_runner()
-                func(vm, target_mem)
-                self.check_memory(vm)
+                for target_mem in target_mems.split():
+                    func(vm, target_mem)
+                    self.check_memory(vm)
             else:
-                func(vm, target_mem)
-                self.check_memory(vm)
+                for target_mem in target_mems.split():
+                    func(vm, target_mem)
+                    self.check_memory(vm)
                 sub_test = sub_test_runner()
             if stage == "during":
                 sub_test.join(timeout=3600)