Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
875012f3
T
tp-qemu
项目概览
openeuler
/
tp-qemu
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
tp-qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
875012f3
编写于
7月 08, 2020
作者:
Y
Yumei Huang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update some numa related cases to use memdev option
Signed-off-by:
N
Yumei Huang
<
yuhuang@redhat.com
>
上级
25392290
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
81 addition
and
32 deletion
+81
-32
qemu/tests/cfg/balloon_memhp.cfg
qemu/tests/cfg/balloon_memhp.cfg
+10
-0
qemu/tests/cfg/cpu_device_hotpluggable.cfg
qemu/tests/cfg/cpu_device_hotpluggable.cfg
+10
-0
qemu/tests/cfg/hotplug_mem.cfg
qemu/tests/cfg/hotplug_mem.cfg
+14
-1
qemu/tests/cfg/hotplug_mem_negative.cfg
qemu/tests/cfg/hotplug_mem_negative.cfg
+6
-1
qemu/tests/cfg/numa_opts.cfg
qemu/tests/cfg/numa_opts.cfg
+28
-20
qemu/tests/numa_opts.py
qemu/tests/numa_opts.py
+13
-10
未找到文件。
qemu/tests/cfg/balloon_memhp.cfg
浏览文件 @
875012f3
...
@@ -2,12 +2,22 @@
...
@@ -2,12 +2,22 @@
type = balloon_memhp
type = balloon_memhp
slots_mem = 4
slots_mem = 4
size_mem = 1G
size_mem = 1G
mem_fixed = 4096
maxmem_mem = 64G
maxmem_mem = 64G
login_timeout = 600
login_timeout = 600
no Host_RHEL.m6
no Host_RHEL.m6
no RHEL.5
no RHEL.5
only Linux Win2008.x86_64 Win2012.x86_64 Win2016.x86_64 Win2019.x86_64
only Linux Win2008.x86_64 Win2012.x86_64 Win2016.x86_64 Win2019.x86_64
guest_numa_nodes = "node0 node1"
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"
target_mem = "plug"
balloon = balloon0
balloon = balloon0
balloon_dev_devid = balloon0
balloon_dev_devid = balloon0
...
...
qemu/tests/cfg/cpu_device_hotpluggable.cfg
浏览文件 @
875012f3
...
@@ -71,9 +71,19 @@
...
@@ -71,9 +71,19 @@
only multi_vcpu
only multi_vcpu
type = cpu_device_hotpluggable_with_numa
type = cpu_device_hotpluggable_with_numa
start_vm = no
start_vm = no
mem_fixed = 4096
guest_numa_nodes = node0 node1
guest_numa_nodes = node0 node1
numa_nodeid_node0 = 0
numa_nodeid_node0 = 0
numa_nodeid_node1 = 1
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:
variants:
- single_vcpu:
- single_vcpu:
vcpu_devices = vcpu1
vcpu_devices = vcpu1
...
...
qemu/tests/cfg/hotplug_mem.cfg
浏览文件 @
875012f3
...
@@ -45,6 +45,11 @@
...
@@ -45,6 +45,11 @@
variants numa_nodes:
variants numa_nodes:
- one:
- one:
guest_numa_nodes = "node0"
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_mem
del numa_cpus
del numa_cpus
del numa_nodeid
del numa_nodeid
...
@@ -55,7 +60,15 @@
...
@@ -55,7 +60,15 @@
del numa_mem
del numa_mem
del numa_cpus
del numa_cpus
numa_nodeid = 0
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_mem2 = 0
node_dimm_mem1 = 1
node_dimm_mem1 = 1
numa_nodeid_node0 = 0
numa_nodeid_node0 = 0
...
...
qemu/tests/cfg/hotplug_mem_negative.cfg
浏览文件 @
875012f3
...
@@ -6,6 +6,11 @@
...
@@ -6,6 +6,11 @@
size_mem = 1G
size_mem = 1G
maxmem_mem = 32G
maxmem_mem = 32G
guest_numa_nodes = "node0"
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:
ppc64,ppc64le:
threshold = 0.15
threshold = 0.15
policy_mem = default
policy_mem = default
...
@@ -20,7 +25,7 @@
...
@@ -20,7 +25,7 @@
size_mem = 0G
size_mem = 0G
keywords = "doesn\'t take value \'0\'"
keywords = "doesn\'t take value \'0\'"
- invalid_backend_ram_option:
- invalid_backend_ram_option:
policy_mem = bind
policy_mem
_plug1
= bind
keywords = "cannot bind memory to host NUMA nodes"
keywords = "cannot bind memory to host NUMA nodes"
- invalid_numa_node:
- invalid_numa_node:
node_dimm_plug1 = 2
node_dimm_plug1 = 2
...
...
qemu/tests/cfg/numa_opts.cfg
浏览文件 @
875012f3
...
@@ -9,44 +9,52 @@
...
@@ -9,44 +9,52 @@
smp = 6
smp = 6
mem = 4096
mem = 4096
vcpu_maxcpus = ${smp}
vcpu_maxcpus = ${smp}
backend_mem = memory-backend-ram
use_mem = no
variants:
variants:
- nodes.0:
- nodes.0:
# no extra parameters => zero nodes
# no extra parameters => zero nodes
numa_nodes = 0
numa_nodes = 0
# on ppc,no extra parameters => one node
# on ppc,no extra parameters => one node
with size = mem
ppc64le, ppc64:
ppc64le, ppc64:
numa_nodes = 1
numa_nodes = 1
- nodes.1:
- nodes.1:
numa_nodes = 1
numa_nodes = 1
extra_params += " -numa node"
mem_devs = "mem0"
numa_node0_cpus = "0 1 2 3 4 5"
size_mem0 = 4096M
numa_node0_size = 4096
guest_numa_nodes = "node0"
numa_memdev_node0 = mem-mem0
numa_cpus_node0 = "0,1,2,3,4,5"
- nodes.2:
- nodes.2:
numa_nodes = 2
numa_nodes = 2
numa_node0_cpus = "4 5"
mem_devs = "mem0 mem1"
numa_node0_size = 1024
size_mem0 = 1024M
numa_node1_cpus = "0 1 2 3"
size_mem1 = 3072M
numa_node1_size = 3072
guest_numa_nodes = "node0 node1"
extra_params += " -numa node,mem=1024,cpus=4-5"
numa_memdev_node0 = mem-mem0
extra_params += " -numa node,mem=3072,cpus=0-3"
numa_memdev_node1 = mem-mem1
numa_cpus_node0 = "4,5"
numa_cpus_node1 = "0,1,2,3"
- nodes.3:
- nodes.3:
numa_nodes = 3
numa_nodes = 3
numa_node0_cpus = "0 1"
mem_devs = "mem0 mem1 mem2"
numa_node0_size = 512
size_mem0 = 512M
numa_node1_cpus = "2 3"
size_mem1 = 1024M
numa_node1_size = 1024
size_mem2 = 2560M
numa_node2_cpus = "4 5"
guest_numa_nodes = "node0 node1 node2"
numa_node2_size = 2560
numa_memdev_node0 = mem-mem0
extra_params += " -numa node,mem=512,cpus=0-1"
numa_memdev_node1 = mem-mem1
extra_params += " -numa node,mem=1024,cpus=2-3"
numa_memdev_node2 = mem-mem2
extra_params += " -numa node,mem=2560,cpus=4-5"
numa_cpus_node0 = "0,1"
numa_cpus_node1 = "2,3"
numa_cpus_node2 = "4,5"
- nodes.128:
- nodes.128:
type = numa_maxnodes
type = numa_maxnodes
numa_nodes = 128
numa_nodes = 128
mem_fixed = 4G
mem_fixed = 4G
vm_mem_minimum = 4G
vm_mem_minimum = 4G
use_mem = no
node_size = 32M
node_size = 32M
start_vm = no
ppc64,ppc64le:
ppc64,ppc64le:
mem_fixed = 32G
mem_fixed = 32G
node_size = 256M
node_size = 256M
...
...
qemu/tests/numa_opts.py
浏览文件 @
875012f3
import
logging
import
logging
from
virttest.utils_misc
import
normalize_data_size
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
@@ -29,17 +30,19 @@ def run(test, params, env):
...
@@ -29,17 +30,19 @@ def run(test, params, env):
(
len
(
numa
),
numa_nodes
))
(
len
(
numa
),
numa_nodes
))
for
nodenr
,
node
in
enumerate
(
numa
):
for
nodenr
,
node
in
enumerate
(
numa
):
size
=
params
.
get
(
"numa_node%d_size"
%
(
nodenr
))
mdev
=
params
.
get
(
"numa_memdev_node%d"
%
(
nodenr
))
if
size
is
not
None
:
if
mdev
:
size
=
int
(
size
)
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
]:
if
size
!=
numa
[
nodenr
][
0
]:
test
.
fail
(
test
.
fail
(
"Wrong size of numa node %d: %d. Expected: %d"
%
"Wrong size of numa node %d: %d. Expected: %d"
%
(
nodenr
,
numa
[
nodenr
][
0
],
size
))
(
nodenr
,
numa
[
nodenr
][
0
],
size
))
cpus
=
params
.
get
(
"numa_
node%d_cpus
"
%
(
nodenr
))
cpus
=
params
.
get
(
"numa_
cpus_node%d
"
%
(
nodenr
))
if
cpus
is
not
None
:
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
]:
if
cpus
!=
numa
[
nodenr
][
1
]:
test
.
fail
(
test
.
fail
(
"Wrong CPU set on numa node %d: %s. Expected: %s"
%
"Wrong CPU set on numa node %d: %s. Expected: %s"
%
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录