Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
8c133303
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,发现更多精彩内容 >>
提交
8c133303
编写于
8月 29, 2016
作者:
C
Cong
提交者:
GitHub
8月 29, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #653 from PyLearner/bug-fix
update pci_hotplug cfg to contain the serial opton when hotplug block
上级
59b5b002
6e2cf7e4
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
9 addition
and
5 deletion
+9
-5
qemu/tests/cfg/pci_hotplug.cfg
qemu/tests/cfg/pci_hotplug.cfg
+3
-1
qemu/tests/pci_hotplug.py
qemu/tests/pci_hotplug.py
+6
-4
未找到文件。
qemu/tests/cfg/pci_hotplug.cfg
浏览文件 @
8c133303
...
...
@@ -148,7 +148,9 @@
image_format_stg = qcow2
reference_cmd = lspci
find_pci_cmd = 'lspci'
pci_test_cmd = "echo PCI_NUM; yes | mke2fs `fdisk -l 2>&1 | awk '/\/dev\/[sv]d[a-z]* doesn/ {print $2}'` | sort | tail -1"
blk_extra_params_stg = "serial=TARGET_DISK0"
pci_test_cmd = "echo PCI_NUM; yes | mke2fs `fdisk -l 2>&1 | grep "Disk /dev/[vs]d[a-z]" | cut -d" " -f2 | cut -d: -f1 | tail -1`"
Windows:
reference_cmd = wmic diskdrive list
find_pci_cmd = wmic diskdrive list
...
...
qemu/tests/pci_hotplug.py
浏览文件 @
8c133303
...
...
@@ -114,6 +114,8 @@ def run(test, params, env):
if
not
image_format
:
image_format
=
params
.
get
(
"image_format"
,
"qcow2"
)
image_filename
=
find_image
(
pci_num
)
data_image
=
params
.
get
(
"images"
).
split
()[
-
1
]
serial_id
=
params
[
"blk_extra_params_%s"
%
data_image
].
split
(
"="
)[
1
]
pci_model
=
params
.
get
(
"pci_model"
)
controller_model
=
None
...
...
@@ -142,13 +144,13 @@ def run(test, params, env):
verify_supported_device
(
pci_model
)
if
drive_cmd_type
==
"drive_add"
:
driver_add_cmd
=
(
"%s auto file=%s,if=none,format=%s,id=%s"
%
driver_add_cmd
=
(
"%s auto file=%s,if=none,format=%s,id=%s
,serial=%s
"
%
(
drive_cmd_type
,
image_filename
,
image_format
,
pci_info
[
pci_num
][
0
]))
pci_info
[
pci_num
][
0
]
,
serial_id
))
elif
drive_cmd_type
==
"__com.redhat_drive_add"
:
driver_add_cmd
=
(
"%s file=%s,format=%s,id=%s"
%
driver_add_cmd
=
(
"%s file=%s,format=%s,id=%s
,serial=%s
"
%
(
drive_cmd_type
,
image_filename
,
image_format
,
pci_info
[
pci_num
][
0
]))
pci_info
[
pci_num
][
0
]
,
serial_id
))
# add block device to vm device container
image_name
=
img_list
[
pci_num
+
1
]
image_params
=
params
.
object_params
(
image_name
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录