diff --git a/qemu/tests/cfg/balloon_memhp.cfg b/qemu/tests/cfg/balloon_memhp.cfg index 831711b404f9dfb62dcd1d36d0ba0ef4db3f3e63..4afeef496df831ae25ac3c2a8b80e114edc78ddd 100644 --- a/qemu/tests/cfg/balloon_memhp.cfg +++ b/qemu/tests/cfg/balloon_memhp.cfg @@ -2,12 +2,22 @@ type = balloon_memhp slots_mem = 4 size_mem = 1G + mem_fixed = 4096 maxmem_mem = 64G login_timeout = 600 no Host_RHEL.m6 no RHEL.5 only Linux Win2008.x86_64 Win2012.x86_64 Win2016.x86_64 Win2019.x86_64 guest_numa_nodes = "node0 node1" + mem_devs = "mem0 mem1" + numa_memdev_node0 = mem-mem0 + numa_memdev_node1 = mem-mem1 + use_mem_mem0 = "no" + use_mem_mem1 = "no" + size_mem_mem0 = 2048M + size_mem_mem1 = 2048M + backend_mem_mem0 = memory-backend-ram + backend_mem_mem1 = memory-backend-ram target_mem = "plug" balloon = balloon0 balloon_dev_devid = balloon0 diff --git a/qemu/tests/cfg/cpu_device_hotpluggable.cfg b/qemu/tests/cfg/cpu_device_hotpluggable.cfg index 552844755b0dad9c29662fdafc89404b44f042cf..e500619e5048fd9112eea92e572fb7f3af33a89a 100644 --- a/qemu/tests/cfg/cpu_device_hotpluggable.cfg +++ b/qemu/tests/cfg/cpu_device_hotpluggable.cfg @@ -71,9 +71,19 @@ only multi_vcpu type = cpu_device_hotpluggable_with_numa start_vm = no + mem_fixed = 4096 guest_numa_nodes = node0 node1 numa_nodeid_node0 = 0 numa_nodeid_node1 = 1 + mem_devs = "mem0 mem1" + size_mem0 = 2048M + size_mem1 = 2048M + use_mem_mem0 = "no" + use_mem_mem1 = "no" + numa_memdev_node0 = mem-mem0 + numa_memdev_node1 = mem-mem1 + backend_mem_mem0 = memory-backend-ram + backend_mem_mem1 = memory-backend-ram variants: - single_vcpu: vcpu_devices = vcpu1 diff --git a/qemu/tests/cfg/hotplug_mem.cfg b/qemu/tests/cfg/hotplug_mem.cfg index 0b4dfc3149a6a87681f9bcea05fe792b3459680b..58396dd9fd7941ae70d5b370e3130e7897fbd38b 100644 --- a/qemu/tests/cfg/hotplug_mem.cfg +++ b/qemu/tests/cfg/hotplug_mem.cfg @@ -45,6 +45,11 @@ variants numa_nodes: - one: guest_numa_nodes = "node0" + mem_devs += " memN0" + use_mem_memN0 = "no" + size_mem_memN0 = 4096M + backend_mem_memN0 = memory-backend-ram + numa_memdev_node0 = mem-memN0 del numa_mem del numa_cpus del numa_nodeid @@ -55,7 +60,15 @@ del numa_mem del numa_cpus numa_nodeid = 0 - mem_devs += " mem2" + mem_devs += " mem2 memN0 memN1" + numa_memdev_node0 = mem-memN0 + numa_memdev_node1 = mem-memN1 + use_mem_memN0 = "no" + use_mem_memN1 = "no" + size_mem_memN0 = 2048M + size_mem_memN1 = 2048M + backend_mem_memN0 = memory-backend-ram + backend_mem_memN1 = memory-backend-ram node_dimm_mem2 = 0 node_dimm_mem1 = 1 numa_nodeid_node0 = 0 diff --git a/qemu/tests/cfg/hotplug_mem_negative.cfg b/qemu/tests/cfg/hotplug_mem_negative.cfg index 4ac98cfdec21615966ecae5ca86349d0f250452a..f209563bda59e122cb17d092fbe631a926ffb4b5 100644 --- a/qemu/tests/cfg/hotplug_mem_negative.cfg +++ b/qemu/tests/cfg/hotplug_mem_negative.cfg @@ -6,6 +6,11 @@ size_mem = 1G maxmem_mem = 32G guest_numa_nodes = "node0" + mem_devs = "mem0" + numa_memdev_node0 = mem-mem0 + use_mem_mem0 = "no" + size_mem_mem0 = 4096M + backend_mem_mem0 = memory-backend-ram ppc64,ppc64le: threshold = 0.15 policy_mem = default @@ -20,7 +25,7 @@ size_mem = 0G keywords = "doesn\'t take value \'0\'" - invalid_backend_ram_option: - policy_mem = bind + policy_mem_plug1 = bind keywords = "cannot bind memory to host NUMA nodes" - invalid_numa_node: node_dimm_plug1 = 2 diff --git a/qemu/tests/cfg/numa_opts.cfg b/qemu/tests/cfg/numa_opts.cfg index 8747bced5068db1af8da26df33857e2e1ef7c264..ea40638648de09d58987fc859e264cecaa884995 100644 --- a/qemu/tests/cfg/numa_opts.cfg +++ b/qemu/tests/cfg/numa_opts.cfg @@ -9,44 +9,52 @@ smp = 6 mem = 4096 vcpu_maxcpus = ${smp} + backend_mem = memory-backend-ram + use_mem = no variants: - nodes.0: # no extra parameters => zero nodes numa_nodes = 0 - # on ppc,no extra parameters => one node + # on ppc,no extra parameters => one node with size = mem ppc64le, ppc64: numa_nodes = 1 - nodes.1: numa_nodes = 1 - extra_params += " -numa node" - numa_node0_cpus = "0 1 2 3 4 5" - numa_node0_size = 4096 + mem_devs = "mem0" + size_mem0 = 4096M + guest_numa_nodes = "node0" + numa_memdev_node0 = mem-mem0 + numa_cpus_node0 = "0,1,2,3,4,5" - nodes.2: numa_nodes = 2 - numa_node0_cpus = "4 5" - numa_node0_size = 1024 - numa_node1_cpus = "0 1 2 3" - numa_node1_size = 3072 - extra_params += " -numa node,mem=1024,cpus=4-5" - extra_params += " -numa node,mem=3072,cpus=0-3" + mem_devs = "mem0 mem1" + size_mem0 = 1024M + size_mem1 = 3072M + guest_numa_nodes = "node0 node1" + numa_memdev_node0 = mem-mem0 + numa_memdev_node1 = mem-mem1 + numa_cpus_node0 = "4,5" + numa_cpus_node1 = "0,1,2,3" - nodes.3: numa_nodes = 3 - numa_node0_cpus = "0 1" - numa_node0_size = 512 - numa_node1_cpus = "2 3" - numa_node1_size = 1024 - numa_node2_cpus = "4 5" - numa_node2_size = 2560 - extra_params += " -numa node,mem=512,cpus=0-1" - extra_params += " -numa node,mem=1024,cpus=2-3" - extra_params += " -numa node,mem=2560,cpus=4-5" + mem_devs = "mem0 mem1 mem2" + size_mem0 = 512M + size_mem1 = 1024M + size_mem2 = 2560M + guest_numa_nodes = "node0 node1 node2" + numa_memdev_node0 = mem-mem0 + numa_memdev_node1 = mem-mem1 + numa_memdev_node2 = mem-mem2 + numa_cpus_node0 = "0,1" + numa_cpus_node1 = "2,3" + numa_cpus_node2 = "4,5" - nodes.128: type = numa_maxnodes numa_nodes = 128 mem_fixed = 4G vm_mem_minimum = 4G - use_mem = no node_size = 32M + start_vm = no ppc64,ppc64le: mem_fixed = 32G node_size = 256M diff --git a/qemu/tests/numa_opts.py b/qemu/tests/numa_opts.py index 3a1d489cb13f3828fe6426055349f8b337f9af70..28e5e8c70c5a70e8d16589b4bac1b5a6824988f0 100644 --- a/qemu/tests/numa_opts.py +++ b/qemu/tests/numa_opts.py @@ -1,4 +1,5 @@ import logging +from virttest.utils_misc import normalize_data_size logger = logging.getLogger(__name__) @@ -29,17 +30,19 @@ def run(test, params, env): (len(numa), numa_nodes)) for nodenr, node in enumerate(numa): - size = params.get("numa_node%d_size" % (nodenr)) - if size is not None: - size = int(size) - if size != numa[nodenr][0]: - test.fail( - "Wrong size of numa node %d: %d. Expected: %d" % - (nodenr, numa[nodenr][0], size)) - - cpus = params.get("numa_node%d_cpus" % (nodenr)) + mdev = params.get("numa_memdev_node%d" % (nodenr)) + if mdev: + mdev = mdev.split('-')[1] + size = float(normalize_data_size(params.get("size_%s" % mdev))) + else: + size = params.get_numeric("mem") + if size != numa[nodenr][0]: + test.fail("Wrong size of numa node %d: %d. Expected: %d" % + (nodenr, numa[nodenr][0], size)) + + cpus = params.get("numa_cpus_node%d" % (nodenr)) if cpus is not None: - cpus = set([int(v) for v in cpus.split()]) + cpus = set([int(v) for v in cpus.split(",")]) if cpus != numa[nodenr][1]: test.fail( "Wrong CPU set on numa node %d: %s. Expected: %s" %