Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
8b43335a
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看板
提交
8b43335a
编写于
6月 22, 2015
作者:
P
Peter Krempa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test: Extract code to free testDriver into testDriverFree
Avoid reimplementing it 3 times.
上级
c54cfc45
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
32 deletion
+23
-32
src/test/test_driver.c
src/test/test_driver.c
+23
-32
未找到文件。
src/test/test_driver.c
浏览文件 @
8b43335a
...
@@ -135,6 +135,26 @@ static const virNodeInfo defaultNodeInfo = {
...
@@ -135,6 +135,26 @@ static const virNodeInfo defaultNodeInfo = {
2
,
2
,
};
};
static
void
testDriverFree
(
testDriverPtr
driver
)
{
if
(
!
driver
)
return
;
virObjectUnref
(
driver
->
caps
);
virObjectUnref
(
driver
->
xmlopt
);
virObjectUnref
(
driver
->
domains
);
virNodeDeviceObjListFree
(
&
driver
->
devs
);
virObjectUnref
(
driver
->
networks
);
virInterfaceObjListFree
(
&
driver
->
ifaces
);
virStoragePoolObjListFree
(
&
driver
->
pools
);
virObjectEventStateFree
(
driver
->
eventState
);
VIR_FREE
(
driver
->
path
);
virMutexUnlock
(
&
driver
->
lock
);
virMutexDestroy
(
&
driver
->
lock
);
VIR_FREE
(
driver
);
}
static
void
testObjectEventQueue
(
testDriverPtr
driver
,
static
void
testObjectEventQueue
(
testDriverPtr
driver
,
virObjectEventPtr
event
);
virObjectEventPtr
event
);
...
@@ -830,16 +850,7 @@ testOpenDefault(virConnectPtr conn)
...
@@ -830,16 +850,7 @@ testOpenDefault(virConnectPtr conn)
return
VIR_DRV_OPEN_SUCCESS
;
return
VIR_DRV_OPEN_SUCCESS
;
error:
error:
if
(
privconn
)
{
testDriverFree
(
privconn
);
virObjectUnref
(
privconn
->
domains
);
virObjectUnref
(
privconn
->
networks
);
virInterfaceObjListFree
(
&
privconn
->
ifaces
);
virStoragePoolObjListFree
(
&
privconn
->
pools
);
virNodeDeviceObjListFree
(
&
privconn
->
devs
);
virObjectUnref
(
privconn
->
caps
);
virObjectEventStateFree
(
privconn
->
eventState
);
virMutexDestroy
(
&
privconn
->
lock
);
}
conn
->
privateData
=
NULL
;
conn
->
privateData
=
NULL
;
virDomainDefFree
(
domdef
);
virDomainDefFree
(
domdef
);
defaultConnections
--
;
defaultConnections
--
;
...
@@ -1465,14 +1476,7 @@ testOpenFromFile(virConnectPtr conn, const char *file)
...
@@ -1465,14 +1476,7 @@ testOpenFromFile(virConnectPtr conn, const char *file)
error:
error:
xmlXPathFreeContext
(
ctxt
);
xmlXPathFreeContext
(
ctxt
);
xmlFreeDoc
(
doc
);
xmlFreeDoc
(
doc
);
virObjectUnref
(
privconn
->
domains
);
testDriverFree
(
privconn
);
virObjectUnref
(
privconn
->
networks
);
virInterfaceObjListFree
(
&
privconn
->
ifaces
);
virStoragePoolObjListFree
(
&
privconn
->
pools
);
VIR_FREE
(
privconn
->
path
);
virObjectEventStateFree
(
privconn
->
eventState
);
testDriverUnlock
(
privconn
);
VIR_FREE
(
privconn
);
conn
->
privateData
=
NULL
;
conn
->
privateData
=
NULL
;
return
VIR_DRV_OPEN_ERROR
;
return
VIR_DRV_OPEN_ERROR
;
}
}
...
@@ -1590,20 +1594,7 @@ static int testConnectClose(virConnectPtr conn)
...
@@ -1590,20 +1594,7 @@ static int testConnectClose(virConnectPtr conn)
}
}
testDriverLock
(
privconn
);
testDriverLock
(
privconn
);
virObjectUnref
(
privconn
->
caps
);
testDriverFree
(
privconn
);
virObjectUnref
(
privconn
->
xmlopt
);
virObjectUnref
(
privconn
->
domains
);
virNodeDeviceObjListFree
(
&
privconn
->
devs
);
virObjectUnref
(
privconn
->
networks
);
virInterfaceObjListFree
(
&
privconn
->
ifaces
);
virStoragePoolObjListFree
(
&
privconn
->
pools
);
virObjectEventStateFree
(
privconn
->
eventState
);
VIR_FREE
(
privconn
->
path
);
testDriverUnlock
(
privconn
);
virMutexDestroy
(
&
privconn
->
lock
);
VIR_FREE
(
privconn
);
if
(
dflt
)
{
if
(
dflt
)
{
defaultConn
=
NULL
;
defaultConn
=
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录