Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
4c3f3b4d
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,发现更多精彩内容 >>
提交
4c3f3b4d
编写于
4月 21, 2009
作者:
D
Daniel Veillard
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
* src/network_conf.c src/network_conf.h: add dynamic bridge names
support, patch by Soren Hansen * AUTHORS: add Soren daniel
上级
ec4e3791
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
6 deletion
+22
-6
AUTHORS
AUTHORS
+1
-0
ChangeLog
ChangeLog
+6
-0
src/network_conf.c
src/network_conf.c
+13
-5
src/network_conf.h
src/network_conf.h
+2
-1
未找到文件。
AUTHORS
浏览文件 @
4c3f3b4d
...
...
@@ -69,6 +69,7 @@ Patches have also been contributed by:
Florian Vichot <florian.vichot@diateam.net>
Takahashi Tomohiro <takatom@jp.fujitsu.com>
Serge E. Hallyn <serue@us.ibm.com>
Soren Hansen <soren@ubuntu.com>
[....send patches to get your name here....]
...
...
ChangeLog
浏览文件 @
4c3f3b4d
Tue Apr 21 20:58:50 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/network_conf.c src/network_conf.h: add dynamic bridge names
support, patch by Soren Hansen
* AUTHORS: add Soren
Tue Apr 21 17:08:57 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/xend_internal.c: let xend try vcpu pinning operation even
...
...
src/network_conf.c
浏览文件 @
4c3f3b4d
...
...
@@ -724,6 +724,7 @@ virNetworkObjPtr virNetworkLoadConfig(virConnectPtr conn,
virNetworkDefPtr
def
=
NULL
;
virNetworkObjPtr
net
;
int
autostart
;
char
*
tmp
;
if
((
configFile
=
virNetworkConfigFile
(
conn
,
configDir
,
name
))
==
NULL
)
goto
error
;
...
...
@@ -747,7 +748,10 @@ virNetworkObjPtr virNetworkLoadConfig(virConnectPtr conn,
/* Generate a bridge if none is found, but don't check for collisions
* if a bridge is hardcoded, so the network is at least defined
*/
if
(
!
def
->
bridge
&&
!
(
def
->
bridge
=
virNetworkAllocateBridge
(
conn
,
nets
)))
if
(
tmp
=
virNetworkAllocateBridge
(
conn
,
nets
,
def
->
bridge
))
{
VIR_FREE
(
def
->
bridge
);
def
->
bridge
=
tmp
;
}
else
goto
error
;
if
(
!
(
net
=
virNetworkAssignDef
(
conn
,
nets
,
def
)))
...
...
@@ -875,16 +879,20 @@ int virNetworkBridgeInUse(const virNetworkObjListPtr nets,
}
char
*
virNetworkAllocateBridge
(
virConnectPtr
conn
,
const
virNetworkObjListPtr
nets
)
const
virNetworkObjListPtr
nets
,
const
char
*
template
)
{
int
id
=
0
;
char
*
newname
;
if
(
!
template
)
template
=
"virbr%d"
;
do
{
char
try
[
50
];
snprintf
(
try
,
sizeof
(
try
),
"virbr%d"
,
id
);
snprintf
(
try
,
sizeof
(
try
),
template
,
id
);
if
(
!
virNetworkBridgeInUse
(
nets
,
try
,
NULL
))
{
if
(
!
(
newname
=
strdup
(
try
)))
{
...
...
@@ -909,7 +917,7 @@ int virNetworkSetBridgeName(virConnectPtr conn,
int
ret
=
-
1
;
if
(
def
->
bridge
)
{
if
(
def
->
bridge
&&
!
strstr
(
def
->
bridge
,
"%d"
)
)
{
if
(
virNetworkBridgeInUse
(
nets
,
def
->
bridge
,
def
->
name
))
{
networkReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"bridge name '%s' already in use."
),
...
...
@@ -918,7 +926,7 @@ int virNetworkSetBridgeName(virConnectPtr conn,
}
}
else
{
/* Allocate a bridge name */
if
(
!
(
def
->
bridge
=
virNetworkAllocateBridge
(
conn
,
nets
)))
if
(
!
(
def
->
bridge
=
virNetworkAllocateBridge
(
conn
,
nets
,
def
->
bridge
)))
goto
error
;
}
...
...
src/network_conf.h
浏览文件 @
4c3f3b4d
...
...
@@ -174,7 +174,8 @@ int virNetworkBridgeInUse(const virNetworkObjListPtr nets,
const
char
*
skipname
);
char
*
virNetworkAllocateBridge
(
virConnectPtr
conn
,
const
virNetworkObjListPtr
nets
);
const
virNetworkObjListPtr
nets
,
const
char
*
template
);
int
virNetworkSetBridgeName
(
virConnectPtr
conn
,
const
virNetworkObjListPtr
nets
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录