Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
98c69644
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
98c69644
编写于
8月 03, 2016
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemuxml2argvtest: Rename extraFlags as qemuCaps
Signed-off-by:
N
Jiri Denemark
<
jdenemar@redhat.com
>
上级
d037d800
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
14 deletion
+14
-14
tests/qemuxml2argvtest.c
tests/qemuxml2argvtest.c
+14
-14
未找到文件。
tests/qemuxml2argvtest.c
浏览文件 @
98c69644
...
...
@@ -267,7 +267,7 @@ typedef enum {
static
int
testCompareXMLToArgvFiles
(
const
char
*
xml
,
const
char
*
cmdline
,
virQEMUCapsPtr
extraFlag
s
,
virQEMUCapsPtr
qemuCap
s
,
const
char
*
migrateURI
,
virQemuXML2ArgvTestFlags
flags
,
unsigned
int
parseFlags
)
...
...
@@ -314,7 +314,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
if
(
qemuProcessPrepareMonitorChr
(
&
monitor_chr
,
priv
->
libDir
)
<
0
)
goto
out
;
virQEMUCapsSetList
(
extraFlag
s
,
virQEMUCapsSetList
(
qemuCap
s
,
QEMU_CAPS_NO_ACPI
,
QEMU_CAPS_LAST
);
...
...
@@ -325,7 +325,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto
out
;
}
virQEMUCapsFilterByMachineType
(
extraFlag
s
,
vm
->
def
->
os
.
machine
);
virQEMUCapsFilterByMachineType
(
qemuCap
s
,
vm
->
def
->
os
.
machine
);
log
=
virTestLogContentAndReset
();
VIR_FREE
(
log
);
...
...
@@ -333,7 +333,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
if
(
vm
->
def
->
os
.
arch
==
VIR_ARCH_X86_64
||
vm
->
def
->
os
.
arch
==
VIR_ARCH_I686
)
{
virQEMUCapsSet
(
extraFlag
s
,
QEMU_CAPS_PCI_MULTIBUS
);
virQEMUCapsSet
(
qemuCap
s
,
QEMU_CAPS_PCI_MULTIBUS
);
}
for
(
i
=
0
;
i
<
vm
->
def
->
nhostdevs
;
i
++
)
{
...
...
@@ -390,7 +390,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
struct
testInfo
{
const
char
*
name
;
virQEMUCapsPtr
extraFlag
s
;
virQEMUCapsPtr
qemuCap
s
;
const
char
*
migrateFrom
;
int
migrateFd
;
unsigned
int
flags
;
...
...
@@ -418,17 +418,17 @@ testCompareXMLToArgvHelper(const void *data)
abs_srcdir
,
info
->
name
)
<
0
)
goto
cleanup
;
if
(
virQEMUCapsGet
(
info
->
extraFlag
s
,
QEMU_CAPS_MONITOR_JSON
))
if
(
virQEMUCapsGet
(
info
->
qemuCap
s
,
QEMU_CAPS_MONITOR_JSON
))
flags
|=
FLAG_JSON
;
if
(
virQEMUCapsGet
(
info
->
extraFlag
s
,
QEMU_CAPS_ENABLE_FIPS
))
if
(
virQEMUCapsGet
(
info
->
qemuCap
s
,
QEMU_CAPS_ENABLE_FIPS
))
flags
|=
FLAG_FIPS
;
if
(
qemuTestCapsCacheInsert
(
driver
.
qemuCapsCache
,
info
->
name
,
info
->
extraFlag
s
)
<
0
)
info
->
qemuCap
s
)
<
0
)
goto
cleanup
;
result
=
testCompareXMLToArgvFiles
(
xml
,
args
,
info
->
extraFlag
s
,
result
=
testCompareXMLToArgvFiles
(
xml
,
args
,
info
->
qemuCap
s
,
migrateURI
,
flags
,
info
->
parseFlags
);
cleanup:
...
...
@@ -475,13 +475,13 @@ testPrepareExtraFlags(struct testInfo *info,
{
int
ret
=
-
1
;
if
(
!
(
info
->
extraFlag
s
=
virQEMUCapsNew
()))
if
(
!
(
info
->
qemuCap
s
=
virQEMUCapsNew
()))
goto
out
;
if
(
testAddCPUModels
(
info
->
extraFlag
s
,
skipLegacyCPUs
)
<
0
)
if
(
testAddCPUModels
(
info
->
qemuCap
s
,
skipLegacyCPUs
)
<
0
)
goto
out
;
if
(
testQemuCapsSetGIC
(
info
->
extraFlag
s
,
gic
)
<
0
)
if
(
testQemuCapsSetGIC
(
info
->
qemuCap
s
,
gic
)
<
0
)
goto
out
;
ret
=
0
;
...
...
@@ -553,11 +553,11 @@ mymain(void)
}; \
if (testPrepareExtraFlags(&info, skipLegacyCPUs, gic) < 0) \
return EXIT_FAILURE; \
virQEMUCapsSetList(info.
extraFlags, __VA_ARGS__, QEMU_CAPS_LAST);
\
virQEMUCapsSetList(info.
qemuCaps, __VA_ARGS__, QEMU_CAPS_LAST);
\
if (virTestRun("QEMU XML-2-ARGV " name, \
testCompareXMLToArgvHelper, &info) < 0) \
ret = -1; \
virObjectUnref(info.
extraFlags);
\
virObjectUnref(info.
qemuCaps);
\
} while (0)
# define DO_TEST(name, ...) \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录