Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
62bc9567
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,发现更多精彩内容 >>
提交
62bc9567
编写于
3月 02, 2017
作者:
J
John Ferlan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
conf: Use consistent function name prefixes for virnwfilterobj
Use "virNWFilterObj" as a prefix for any external API in virnwfilterobj
上级
44242cce
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
25 addition
and
27 deletion
+25
-27
src/conf/virnwfilterobj.c
src/conf/virnwfilterobj.c
+17
-17
src/conf/virnwfilterobj.h
src/conf/virnwfilterobj.h
+3
-3
src/libvirt_private.syms
src/libvirt_private.syms
+2
-2
src/nwfilter/nwfilter_driver.c
src/nwfilter/nwfilter_driver.c
+3
-5
未找到文件。
src/conf/virnwfilterobj.c
浏览文件 @
62bc9567
...
...
@@ -117,7 +117,7 @@ virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters,
static
int
_virNWFilterDefLoopDetect
(
virNWFilterObjListPtr
nwfilters
,
_virNWFilter
Obj
DefLoopDetect
(
virNWFilterObjListPtr
nwfilters
,
virNWFilterDefPtr
def
,
const
char
*
filtername
)
{
...
...
@@ -141,7 +141,7 @@ _virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters,
obj
=
virNWFilterObjFindByName
(
nwfilters
,
entry
->
include
->
filterref
);
if
(
obj
)
{
rc
=
_virNWFilterDefLoopDetect
(
nwfilters
,
rc
=
_virNWFilter
Obj
DefLoopDetect
(
nwfilters
,
obj
->
def
,
filtername
);
virNWFilterObjUnlock
(
obj
);
...
...
@@ -156,7 +156,7 @@ _virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters,
/*
* virNWFilterDefLoopDetect:
* virNWFilter
Obj
DefLoopDetect:
* @nwfilters : the nwfilters to search
* @def : the filter definition that may add a loop and is to be tested
*
...
...
@@ -166,15 +166,15 @@ _virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters,
* Returns 0 in case no loop was detected, -1 otherwise.
*/
static
int
virNWFilterDefLoopDetect
(
virNWFilterObjListPtr
nwfilters
,
virNWFilter
Obj
DefLoopDetect
(
virNWFilterObjListPtr
nwfilters
,
virNWFilterDefPtr
def
)
{
return
_virNWFilterDefLoopDetect
(
nwfilters
,
def
,
def
->
name
);
return
_virNWFilter
Obj
DefLoopDetect
(
nwfilters
,
def
,
def
->
name
);
}
int
virNWFilterTestUnassignDef
(
virNWFilterObjPtr
nwfilter
)
virNWFilter
Obj
TestUnassignDef
(
virNWFilterObjPtr
nwfilter
)
{
int
rc
=
0
;
...
...
@@ -252,7 +252,7 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
}
}
if
(
virNWFilterDefLoopDetect
(
nwfilters
,
def
)
<
0
)
{
if
(
virNWFilter
Obj
DefLoopDetect
(
nwfilters
,
def
)
<
0
)
{
virReportError
(
VIR_ERR_OPERATION_FAILED
,
"%s"
,
_
(
"filter would introduce a loop"
));
return
NULL
;
...
...
@@ -306,7 +306,7 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
static
virNWFilterObjPtr
virNWFilterLoadConfig
(
virNWFilterObjListPtr
nwfilters
,
virNWFilter
Obj
LoadConfig
(
virNWFilterObjListPtr
nwfilters
,
const
char
*
configDir
,
const
char
*
name
)
{
...
...
@@ -347,7 +347,7 @@ virNWFilterLoadConfig(virNWFilterObjListPtr nwfilters,
int
virNWFilterLoadAllConfigs
(
virNWFilterObjListPtr
nwfilters
,
virNWFilter
Obj
LoadAllConfigs
(
virNWFilterObjListPtr
nwfilters
,
const
char
*
configDir
)
{
DIR
*
dir
;
...
...
@@ -364,7 +364,7 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters,
if
(
!
virFileStripSuffix
(
entry
->
d_name
,
".xml"
))
continue
;
nwfilter
=
virNWFilterLoadConfig
(
nwfilters
,
configDir
,
entry
->
d_name
);
nwfilter
=
virNWFilter
Obj
LoadConfig
(
nwfilters
,
configDir
,
entry
->
d_name
);
if
(
nwfilter
)
virNWFilterObjUnlock
(
nwfilter
);
}
...
...
src/conf/virnwfilterobj.h
浏览文件 @
62bc9567
...
...
@@ -79,10 +79,10 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
virNWFilterDefPtr
def
);
int
virNWFilterTestUnassignDef
(
virNWFilterObjPtr
nwfilter
);
virNWFilter
Obj
TestUnassignDef
(
virNWFilterObjPtr
nwfilter
);
int
virNWFilterLoadAllConfigs
(
virNWFilterObjListPtr
nwfilters
,
virNWFilter
Obj
LoadAllConfigs
(
virNWFilterObjListPtr
nwfilters
,
const
char
*
configDir
);
void
...
...
src/libvirt_private.syms
浏览文件 @
62bc9567
...
...
@@ -957,15 +957,15 @@ virNodeDeviceObjUnlock;
# conf/virnwfilterobj.h
virNWFilterLoadAllConfigs;
virNWFilterObjAssignDef;
virNWFilterObjFindByName;
virNWFilterObjFindByUUID;
virNWFilterObjListFree;
virNWFilterObjLoadAllConfigs;
virNWFilterObjLock;
virNWFilterObjRemove;
virNWFilterObjTestUnassignDef;
virNWFilterObjUnlock;
virNWFilterTestUnassignDef;
# conf/virsecretobj.h
...
...
src/nwfilter/nwfilter_driver.c
浏览文件 @
62bc9567
...
...
@@ -237,8 +237,7 @@ nwfilterStateInitialize(bool privileged,
VIR_FREE
(
base
);
if
(
virNWFilterLoadAllConfigs
(
&
driver
->
nwfilters
,
driver
->
configDir
)
<
0
)
if
(
virNWFilterObjLoadAllConfigs
(
&
driver
->
nwfilters
,
driver
->
configDir
)
<
0
)
goto
error
;
nwfilterDriverUnlock
();
...
...
@@ -290,8 +289,7 @@ nwfilterStateReload(void)
virNWFilterWriteLockFilterUpdates
();
virNWFilterCallbackDriversLock
();
virNWFilterLoadAllConfigs
(
&
driver
->
nwfilters
,
driver
->
configDir
);
virNWFilterObjLoadAllConfigs
(
&
driver
->
nwfilters
,
driver
->
configDir
);
virNWFilterCallbackDriversUnlock
();
virNWFilterUnlockFilterUpdates
();
...
...
@@ -595,7 +593,7 @@ nwfilterUndefine(virNWFilterPtr obj)
if
(
virNWFilterUndefineEnsureACL
(
obj
->
conn
,
nwfilter
->
def
)
<
0
)
goto
cleanup
;
if
(
virNWFilterTestUnassignDef
(
nwfilter
)
<
0
)
{
if
(
virNWFilter
Obj
TestUnassignDef
(
nwfilter
)
<
0
)
{
virReportError
(
VIR_ERR_OPERATION_INVALID
,
"%s"
,
_
(
"nwfilter is in use"
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录