Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
4aaa2157
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,发现更多精彩内容 >>
未验证
提交
4aaa2157
编写于
12月 06, 2017
作者:
X
Xu Han
提交者:
GitHub
12月 06, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1172 from Zhengtong/s390x_watchdog
s390x: add the watchdog type diag288 for s390x
上级
b7594d4d
c6195ee3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
6 deletion
+14
-6
qemu/tests/cfg/watchdog.cfg
qemu/tests/cfg/watchdog.cfg
+6
-1
qemu/tests/watchdog.py
qemu/tests/watchdog.py
+8
-5
未找到文件。
qemu/tests/cfg/watchdog.cfg
浏览文件 @
4aaa2157
...
...
@@ -6,13 +6,18 @@
variants:
-i6300esb:
no RHEL.4
no s390x
watchdog_device_type = i6300esb
dmesg_info = "i6300ESB.*init"
-ib700:
no RHEL.5
no ppc64 ppc64le
only i386 x86_64
watchdog_device_type = ib700
dmesg_info = "ib700wdt.*init"
-diag288:
only s390x
watchdog_device_type = diag288
module_check_cmd = "lsmod | grep diag288"
variants:
- boot_with_watchdog:
test_type = guest_boot_with_watchdog
...
...
qemu/tests/watchdog.py
浏览文件 @
4aaa2157
...
...
@@ -34,9 +34,11 @@ def run(test, params, env):
Check the watchdog device have been found and init successfully. if not
will raise error.
"""
# when using ib700 need modprobe it's driver manually.
# when using ib700
or diag288,
need modprobe it's driver manually.
if
watchdog_device
==
"ib700"
:
session
.
cmd
(
"modprobe ib700wdt"
)
if
watchdog_device
==
"diag288"
:
session
.
cmd
(
"modprobe diag288_wdt"
)
# when wDT is 6300esb need check pci info
if
watchdog_device
==
"i6300esb"
:
...
...
@@ -50,12 +52,13 @@ def run(test, params, env):
logging
.
info
(
"Found watchdog pci device : %s"
%
wdt_pci_info
)
# checking watchdog init info using dmesg
error
.
context
(
"Checking watchdog
init info using dmesg
"
,
logging
.
info
)
error
.
context
(
"Checking watchdog
load info
"
,
logging
.
info
)
dmesg_info
=
params
.
get
(
"dmesg_info"
,
"(i6300ESB|ib700wdt).*init"
)
(
s
,
o
)
=
session
.
cmd_status_output
(
"dmesg | grep -i '%s' "
%
dmesg_info
)
module_check_cmd
=
params
.
get
(
"module_check_cmd"
,
"dmesg | grep -i '%s' "
%
dmesg_info
)
(
s
,
o
)
=
session
.
cmd_status_output
(
module_check_cmd
)
if
s
!=
0
:
error_msg
=
"Wactchdog device '%s' initialization failed "
error_msg
=
"Wactchdog device '%s'
load/
initialization failed "
raise
error
.
TestError
(
error_msg
%
watchdog_device
)
logging
.
info
(
"Watchdog device '%s' add and init successfully"
%
watchdog_device
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录