Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
3dcafffe
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看板
提交
3dcafffe
编写于
9月 11, 2012
作者:
O
Osier Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
virsh: Fix the typos
* tools/virsh-network.c: s/MATCH/VSH_MATCH/
上级
9cc42701
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
14 deletion
+14
-14
tools/virsh-network.c
tools/virsh-network.c
+14
-14
未找到文件。
tools/virsh-network.c
浏览文件 @
3dcafffe
...
...
@@ -434,8 +434,8 @@ fallback:
vshResetLibvirtError
();
/* Get the number of active networks */
if
(
!
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE
)
||
MATCH
(
VIR_CONNECT_LIST_NETWORKS_ACTIVE
))
{
if
(
!
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE
)
||
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_ACTIVE
))
{
if
((
nActiveNets
=
virConnectNumOfNetworks
(
ctl
->
conn
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Failed to get the number of active networks"
));
goto
cleanup
;
...
...
@@ -443,8 +443,8 @@ fallback:
}
/* Get the number of inactive networks */
if
(
!
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE
)
||
MATCH
(
VIR_CONNECT_LIST_NETWORKS_INACTIVE
))
{
if
(
!
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE
)
||
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_INACTIVE
))
{
if
((
nInactiveNets
=
virConnectNumOfDefinedNetworks
(
ctl
->
conn
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Failed to get the number of inactive networks"
));
goto
cleanup
;
...
...
@@ -459,8 +459,8 @@ fallback:
names
=
vshMalloc
(
ctl
,
sizeof
(
char
*
)
*
nAllNets
);
/* Retrieve a list of active network names */
if
(
!
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE
)
||
MATCH
(
VIR_CONNECT_LIST_NETWORKS_ACTIVE
))
{
if
(
!
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE
)
||
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_ACTIVE
))
{
if
(
virConnectListNetworks
(
ctl
->
conn
,
names
,
nActiveNets
)
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Failed to list active networks"
));
...
...
@@ -469,8 +469,8 @@ fallback:
}
/* Add the inactive networks to the end of the name list */
if
(
!
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE
)
||
MATCH
(
VIR_CONNECT_LIST_NETWORKS_ACTIVE
))
{
if
(
!
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE
)
||
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_ACTIVE
))
{
if
(
virConnectListDefinedNetworks
(
ctl
->
conn
,
&
names
[
nActiveNets
],
nInactiveNets
)
<
0
)
{
...
...
@@ -505,26 +505,26 @@ filter:
net
=
list
->
nets
[
i
];
/* persistence filter */
if
(
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT
))
{
if
(
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT
))
{
if
((
persistent
=
virNetworkIsPersistent
(
net
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Failed to get network persistence info"
));
goto
cleanup
;
}
if
(
!
((
MATCH
(
VIR_CONNECT_LIST_NETWORKS_PERSISTENT
)
&&
persistent
)
||
(
MATCH
(
VIR_CONNECT_LIST_NETWORKS_TRANSIENT
)
&&
!
persistent
)))
if
(
!
((
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_PERSISTENT
)
&&
persistent
)
||
(
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_TRANSIENT
)
&&
!
persistent
)))
goto
remove_entry
;
}
/* autostart filter */
if
(
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART
))
{
if
(
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART
))
{
if
(
virNetworkGetAutostart
(
net
,
&
autostart
)
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Failed to get network autostart state"
));
goto
cleanup
;
}
if
(
!
((
MATCH
(
VIR_CONNECT_LIST_NETWORKS_AUTOSTART
)
&&
autostart
)
||
(
MATCH
(
VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART
)
&&
!
autostart
)))
if
(
!
((
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_AUTOSTART
)
&&
autostart
)
||
(
VSH_
MATCH
(
VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART
)
&&
!
autostart
)))
goto
remove_entry
;
}
/* the pool matched all filters, it may stay */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录