Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
29d37818
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,发现更多精彩内容 >>
提交
29d37818
编写于
1月 03, 2013
作者:
G
Guannan Ren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
network: fix typos and docs
上级
e3a04455
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
5 deletion
+8
-5
docs/formatdomain.html.in
docs/formatdomain.html.in
+6
-3
src/conf/domain_conf.c
src/conf/domain_conf.c
+2
-2
未找到文件。
docs/formatdomain.html.in
浏览文件 @
29d37818
...
@@ -2557,12 +2557,15 @@
...
@@ -2557,12 +2557,15 @@
virtualport types (and also to leave out certain attributes); at
virtualport types (and also to leave out certain attributes); at
domain startup time, a complete
<code>
<
virtualport
>
</code>
domain startup time, a complete
<code>
<
virtualport
>
</code>
element will be constructed by merging together the type and
element will be constructed by merging together the type and
attributes found in the which will be filled in from the network
attributes defined in the network and the portgroup referenced
or portgroup
<code>
<
virtualport
>
</code>
)
by the interface. The newly-constructed virtualport is a combination
of them. The attributes from lower virtualport can't make change
on the ones defined in higher virtualport.
Interface takes the highest priority, portgroup is lowest priority.
(
<span
class=
"since"
>
Since 0.10.0
</span>
). For example, in order
(
<span
class=
"since"
>
Since 0.10.0
</span>
). For example, in order
to work properly with both an 802.1Qbh switch and an Open vSwitch
to work properly with both an 802.1Qbh switch and an Open vSwitch
switch, you may choose to specify no type, but both
switch, you may choose to specify no type, but both
an
<code>
instanc
eid
</code>
(in case the switch is 802.1Qbh) and
an
<code>
profil
eid
</code>
(in case the switch is 802.1Qbh) and
an
<code>
interfaceid
</code>
(in case the switch is Open vSwitch)
an
<code>
interfaceid
</code>
(in case the switch is Open vSwitch)
(you may also omit the other attributes, such as managerid,
(you may also omit the other attributes, such as managerid,
typeid, or profileid, to be filled in from the
typeid, or profileid, to be filled in from the
...
...
src/conf/domain_conf.c
浏览文件 @
29d37818
...
@@ -5020,7 +5020,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
...
@@ -5020,7 +5020,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
def->type == VIR_DOMAIN_NET_TYPE_INTERNAL &&
def->type == VIR_DOMAIN_NET_TYPE_INTERNAL &&
xmlStrEqual(cur->name, BAD_CAST "source")) {
xmlStrEqual(cur->name, BAD_CAST "source")) {
internal = virXMLPropString(cur, "name");
internal = virXMLPropString(cur, "name");
} else if (!
network
&&
} else if (!
bridge
&&
def->type == VIR_DOMAIN_NET_TYPE_BRIDGE &&
def->type == VIR_DOMAIN_NET_TYPE_BRIDGE &&
xmlStrEqual(cur->name, BAD_CAST "source")) {
xmlStrEqual(cur->name, BAD_CAST "source")) {
bridge = virXMLPropString(cur, "bridge");
bridge = virXMLPropString(cur, "bridge");
...
@@ -5054,7 +5054,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
...
@@ -5054,7 +5054,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
" <interface type='%s'>"), type);
" <interface type='%s'>"), type);
goto error;
goto error;
}
}
} else if (!
network
&&
} else if (!
address
&&
(def->type == VIR_DOMAIN_NET_TYPE_SERVER ||
(def->type == VIR_DOMAIN_NET_TYPE_SERVER ||
def->type == VIR_DOMAIN_NET_TYPE_CLIENT ||
def->type == VIR_DOMAIN_NET_TYPE_CLIENT ||
def->type == VIR_DOMAIN_NET_TYPE_MCAST) &&
def->type == VIR_DOMAIN_NET_TYPE_MCAST) &&
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录