Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
c63f696c
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,发现更多精彩内容 >>
未验证
提交
c63f696c
编写于
11月 07, 2018
作者:
Q
Qianqian Zhu
提交者:
GitHub
11月 07, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1527 from xiywang/fix_of_bytes_like_obj
qemu_option_check: python3 compatible, add e1000e, remove e1000
上级
f5d51a4d
5fcfbc0e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
10 deletion
+17
-10
qemu/tests/cfg/qemu_option_check.cfg
qemu/tests/cfg/qemu_option_check.cfg
+5
-0
qemu/tests/qemu_option_check.py
qemu/tests/qemu_option_check.py
+12
-10
未找到文件。
qemu/tests/cfg/qemu_option_check.cfg
浏览文件 @
c63f696c
...
@@ -8,8 +8,13 @@
...
@@ -8,8 +8,13 @@
s390x:
s390x:
device_name = virtio-net-ccw
device_name = virtio-net-ccw
- e1000:
- e1000:
RHEL:
only RHEL.6 RHEL.7
no ppc64,ppc64le,s390x
no ppc64,ppc64le,s390x
device_name = e1000
device_name = e1000
- e1000e:
no ppc64,ppc64le,s390x
device_name = e1000e
- rtl8139:
- rtl8139:
no ppc64,ppc64le,s390x
no ppc64,ppc64le,s390x
device_name = rtl8139
device_name = rtl8139
...
...
qemu/tests/qemu_option_check.py
浏览文件 @
c63f696c
...
@@ -26,7 +26,8 @@ def run(test, params, env):
...
@@ -26,7 +26,8 @@ def run(test, params, env):
"""
"""
support_device
=
process
.
system_output
(
"%s -device ? 2>&1"
support_device
=
process
.
system_output
(
"%s -device ? 2>&1"
%
qemu_binary
,
timeout
=
10
,
%
qemu_binary
,
timeout
=
10
,
ignore_status
=
True
,
shell
=
True
)
ignore_status
=
True
,
shell
=
True
).
decode
()
if
not
support_device
:
if
not
support_device
:
test
.
cancel
(
"Can not get qemu support device list"
)
test
.
cancel
(
"Can not get qemu support device list"
)
device_list
=
re
.
findall
(
r
'name\s+"(.*)",'
,
support_device
)
device_list
=
re
.
findall
(
r
'name\s+"(.*)",'
,
support_device
)
...
@@ -42,17 +43,18 @@ def run(test, params, env):
...
@@ -42,17 +43,18 @@ def run(test, params, env):
err_msg
=
"Oops, Your qemu version doesn't support devic '%s', "
err_msg
=
"Oops, Your qemu version doesn't support devic '%s', "
err_msg
+=
"make sure you have inputted a correct device name"
err_msg
+=
"make sure you have inputted a correct device name"
test
.
cancel
(
err_msg
%
device_name
)
test
.
cancel
(
err_msg
%
device_name
)
device_support_option
=
process
.
run
(
"%s -device %s,? 2>&1"
%
device_support_option
=
process
.
system_output
(
"%s -device %s,? 2>&1"
%
(
qemu_binary
,
device_name
),
(
qemu_binary
,
timeout
=
10
,
device_name
),
ignore_status
=
True
,
shell
=
True
)
timeout
=
10
,
if
device_support_option
.
exit_status
:
ignore_status
=
True
,
test
.
error
(
"Oops, output status is wrong"
)
shell
=
True
)
if
not
re
.
findall
(
r
"%s\.(.*)=(.*)"
%
device_name
,
device_support_option
=
device_support_option
.
decode
().
strip
()
device_support_option
.
stdout
):
if
not
re
.
findall
(
r
"%s\.(.*)=(.*)"
%
device_name
,
device_support_option
):
test
.
fail
(
"Qemu option check Failed"
)
test
.
fail
(
"Qemu option check Failed"
)
logging
.
info
(
"Qemu options check successful. output is:
\n
%s"
%
logging
.
info
(
"Qemu options check successful. output is:
\n
%s"
%
device_support_option
.
stdout
)
device_support_option
)
device_name
=
params
.
get
(
"device_name"
)
device_name
=
params
.
get
(
"device_name"
)
qemu_binary
=
utils_misc
.
get_qemu_binary
(
params
)
qemu_binary
=
utils_misc
.
get_qemu_binary
(
params
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录