Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
81be2261
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,发现更多精彩内容 >>
提交
81be2261
编写于
6月 24, 2015
作者:
P
Peter Krempa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test: Extract common parts of test driver data allocation
上级
8b43335a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
55 deletion
+41
-55
src/test/test_driver.c
src/test/test_driver.c
+41
-55
未找到文件。
src/test/test_driver.c
浏览文件 @
81be2261
...
@@ -309,24 +309,6 @@ testDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
...
@@ -309,24 +309,6 @@ testDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
return
-
1
;
return
-
1
;
}
}
static
virDomainXMLOptionPtr
testBuildXMLConfig
(
void
)
{
virDomainXMLPrivateDataCallbacks
priv
=
{
.
alloc
=
testDomainObjPrivateAlloc
,
.
free
=
testDomainObjPrivateFree
};
/* All our XML extensions are input only, so we only need to parse */
virDomainXMLNamespace
ns
=
{
.
parse
=
testDomainDefNamespaceParse
,
.
free
=
testDomainDefNamespaceFree
,
};
return
virDomainXMLOptionNew
(
NULL
,
&
priv
,
&
ns
);
}
static
virCapsPtr
static
virCapsPtr
testBuildCapabilities
(
virConnectPtr
conn
)
testBuildCapabilities
(
virConnectPtr
conn
)
{
{
...
@@ -402,6 +384,45 @@ testBuildCapabilities(virConnectPtr conn)
...
@@ -402,6 +384,45 @@ testBuildCapabilities(virConnectPtr conn)
}
}
static
testDriverPtr
testDriverNew
(
void
)
{
virDomainXMLPrivateDataCallbacks
priv
=
{
.
alloc
=
testDomainObjPrivateAlloc
,
.
free
=
testDomainObjPrivateFree
};
virDomainXMLNamespace
ns
=
{
.
parse
=
testDomainDefNamespaceParse
,
.
free
=
testDomainDefNamespaceFree
,
};
testDriverPtr
ret
;
if
(
VIR_ALLOC
(
ret
)
<
0
)
return
NULL
;
if
(
virMutexInit
(
&
ret
->
lock
)
<
0
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"cannot initialize mutex"
));
goto
error
;
}
if
(
!
(
ret
->
xmlopt
=
virDomainXMLOptionNew
(
NULL
,
&
priv
,
&
ns
))
||
!
(
ret
->
eventState
=
virObjectEventStateNew
())
||
!
(
ret
->
domains
=
virDomainObjListNew
())
||
!
(
ret
->
networks
=
virNetworkObjListNew
()))
goto
error
;
ret
->
nextDomID
=
1
;
return
ret
;
error:
testDriverFree
(
ret
);
return
NULL
;
}
static
const
char
*
defaultDomainXML
=
static
const
char
*
defaultDomainXML
=
"<domain type='test'>"
"<domain type='test'>"
" <name>test</name>"
" <name>test</name>"
...
@@ -730,24 +751,11 @@ testOpenDefault(virConnectPtr conn)
...
@@ -730,24 +751,11 @@ testOpenDefault(virConnectPtr conn)
return
VIR_DRV_OPEN_SUCCESS
;
return
VIR_DRV_OPEN_SUCCESS
;
}
}
if
(
VIR_ALLOC
(
privconn
)
<
0
)
if
(
!
(
privconn
=
testDriverNew
()))
goto
error
;
if
(
virMutexInit
(
&
privconn
->
lock
)
<
0
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"cannot initialize mutex"
));
goto
error
;
goto
error
;
}
conn
->
privateData
=
privconn
;
conn
->
privateData
=
privconn
;
if
(
!
(
privconn
->
eventState
=
virObjectEventStateNew
()))
goto
error
;
if
(
!
(
privconn
->
domains
=
virDomainObjListNew
())
||
!
(
privconn
->
networks
=
virNetworkObjListNew
()))
goto
error
;
memmove
(
&
privconn
->
nodeInfo
,
&
defaultNodeInfo
,
sizeof
(
defaultNodeInfo
));
memmove
(
&
privconn
->
nodeInfo
,
&
defaultNodeInfo
,
sizeof
(
defaultNodeInfo
));
/* Numa setup */
/* Numa setup */
...
@@ -770,11 +778,6 @@ testOpenDefault(virConnectPtr conn)
...
@@ -770,11 +778,6 @@ testOpenDefault(virConnectPtr conn)
if
(
!
(
privconn
->
caps
=
testBuildCapabilities
(
conn
)))
if
(
!
(
privconn
->
caps
=
testBuildCapabilities
(
conn
)))
goto
error
;
goto
error
;
if
(
!
(
privconn
->
xmlopt
=
testBuildXMLConfig
()))
goto
error
;
privconn
->
nextDomID
=
1
;
if
(
!
(
domdef
=
virDomainDefParseString
(
defaultDomainXML
,
if
(
!
(
domdef
=
virDomainDefParseString
(
defaultDomainXML
,
privconn
->
caps
,
privconn
->
caps
,
privconn
->
xmlopt
,
privconn
->
xmlopt
,
...
@@ -1412,31 +1415,15 @@ testOpenFromFile(virConnectPtr conn, const char *file)
...
@@ -1412,31 +1415,15 @@ testOpenFromFile(virConnectPtr conn, const char *file)
xmlXPathContextPtr
ctxt
=
NULL
;
xmlXPathContextPtr
ctxt
=
NULL
;
testDriverPtr
privconn
;
testDriverPtr
privconn
;
if
(
VIR_ALLOC
(
privconn
)
<
0
)
if
(
!
(
privconn
=
testDriverNew
()))
return
VIR_DRV_OPEN_ERROR
;
if
(
virMutexInit
(
&
privconn
->
lock
)
<
0
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"cannot initialize mutex"
));
VIR_FREE
(
privconn
);
return
VIR_DRV_OPEN_ERROR
;
return
VIR_DRV_OPEN_ERROR
;
}
testDriverLock
(
privconn
);
testDriverLock
(
privconn
);
conn
->
privateData
=
privconn
;
conn
->
privateData
=
privconn
;
if
(
!
(
privconn
->
domains
=
virDomainObjListNew
())
||
!
(
privconn
->
networks
=
virNetworkObjListNew
()))
goto
error
;
if
(
!
(
privconn
->
caps
=
testBuildCapabilities
(
conn
)))
if
(
!
(
privconn
->
caps
=
testBuildCapabilities
(
conn
)))
goto
error
;
goto
error
;
if
(
!
(
privconn
->
xmlopt
=
testBuildXMLConfig
()))
goto
error
;
if
(
!
(
privconn
->
eventState
=
virObjectEventStateNew
()))
goto
error
;
if
(
!
(
doc
=
virXMLParseFileCtxt
(
file
,
&
ctxt
)))
if
(
!
(
doc
=
virXMLParseFileCtxt
(
file
,
&
ctxt
)))
goto
error
;
goto
error
;
...
@@ -1446,7 +1433,6 @@ testOpenFromFile(virConnectPtr conn, const char *file)
...
@@ -1446,7 +1433,6 @@ testOpenFromFile(virConnectPtr conn, const char *file)
goto
error
;
goto
error
;
}
}
privconn
->
nextDomID
=
1
;
privconn
->
numCells
=
0
;
privconn
->
numCells
=
0
;
if
(
VIR_STRDUP
(
privconn
->
path
,
file
)
<
0
)
if
(
VIR_STRDUP
(
privconn
->
path
,
file
)
<
0
)
goto
error
;
goto
error
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录