Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
fb4ec823
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看板
提交
fb4ec823
编写于
1月 22, 2009
作者:
J
John Levon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support script for bridge interface type
上级
39e6ded8
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
89 addition
and
11 deletion
+89
-11
ChangeLog
ChangeLog
+28
-0
src/domain_conf.c
src/domain_conf.c
+10
-1
src/domain_conf.h
src/domain_conf.h
+1
-0
src/xend_internal.c
src/xend_internal.c
+21
-8
src/xm_internal.c
src/xm_internal.c
+7
-2
tests/sexpr2xmldata/sexpr2xml-curmem.xml
tests/sexpr2xmldata/sexpr2xml-curmem.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-fv.xml
tests/sexpr2xmldata/sexpr2xml-fv.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+1
-0
tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
+1
-0
未找到文件。
ChangeLog
浏览文件 @
fb4ec823
Thu
Jan
22
09
:
51
:
29
PST
2009
John
Levon
<
john
.
levon
@
sun
.
com
>
*
src
/
domain_conf
.
h
,
src
/
domain_conf
.
c
,
src
/
xend_internal
.
c
,
src
/
xm_internal
.
c
:
Support
script
for
bridge
interface
type
*
tests
/
sexpr2xmldata
/
sexpr2xml
-
curmem
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
disk
-
block
-
shareable
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
localtime
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
parallel
-
tcp
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
file
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
null
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
pipe
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
pty
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
stdio
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
tcp
-
telnet
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
tcp
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
udp
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
serial
-
unix
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
sound
-
all
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
sound
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
usbmouse
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
usbtablet
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
utc
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
-
v2
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
fv
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
net
-
bridged
.
xml
,
tests
/
sexpr2xmldata
/
sexpr2xml
-
net
-
e1000
.
xml
:
update
tests
Wed
Jan
21
18
:
18
:
12
GMT
2009
Daniel
P
.
Berrange
<
berrange
@
redhat
.
com
>
Wed
Jan
21
18
:
18
:
12
GMT
2009
Daniel
P
.
Berrange
<
berrange
@
redhat
.
com
>
Missing
test
case
fix
up
from
Xen
threadsafety
changes
Missing
test
case
fix
up
from
Xen
threadsafety
changes
...
...
src/domain_conf.c
浏览文件 @
fb4ec823
...
@@ -288,6 +288,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def)
...
@@ -288,6 +288,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def)
case
VIR_DOMAIN_NET_TYPE_BRIDGE
:
case
VIR_DOMAIN_NET_TYPE_BRIDGE
:
VIR_FREE
(
def
->
data
.
bridge
.
brname
);
VIR_FREE
(
def
->
data
.
bridge
.
brname
);
VIR_FREE
(
def
->
data
.
bridge
.
script
);
break
;
break
;
}
}
...
@@ -897,7 +898,8 @@ virDomainNetDefParseXML(virConnectPtr conn,
...
@@ -897,7 +898,8 @@ virDomainNetDefParseXML(virConnectPtr conn,
VIR_FREE
(
ifname
);
VIR_FREE
(
ifname
);
}
}
}
else
if
((
script
==
NULL
)
&&
}
else
if
((
script
==
NULL
)
&&
(
def
->
type
==
VIR_DOMAIN_NET_TYPE_ETHERNET
)
&&
(
def
->
type
==
VIR_DOMAIN_NET_TYPE_ETHERNET
||
def
->
type
==
VIR_DOMAIN_NET_TYPE_BRIDGE
)
&&
xmlStrEqual
(
cur
->
name
,
BAD_CAST
"script"
))
{
xmlStrEqual
(
cur
->
name
,
BAD_CAST
"script"
))
{
script
=
virXMLPropString
(
cur
,
"path"
);
script
=
virXMLPropString
(
cur
,
"path"
);
}
else
if
(
xmlStrEqual
(
cur
->
name
,
BAD_CAST
"model"
))
{
}
else
if
(
xmlStrEqual
(
cur
->
name
,
BAD_CAST
"model"
))
{
...
@@ -948,6 +950,10 @@ virDomainNetDefParseXML(virConnectPtr conn,
...
@@ -948,6 +950,10 @@ virDomainNetDefParseXML(virConnectPtr conn,
}
}
def
->
data
.
bridge
.
brname
=
bridge
;
def
->
data
.
bridge
.
brname
=
bridge
;
bridge
=
NULL
;
bridge
=
NULL
;
if
(
script
!=
NULL
)
{
def
->
data
.
bridge
.
script
=
script
;
script
=
NULL
;
}
break
;
break
;
case
VIR_DOMAIN_NET_TYPE_CLIENT
:
case
VIR_DOMAIN_NET_TYPE_CLIENT
:
...
@@ -2883,6 +2889,9 @@ virDomainNetDefFormat(virConnectPtr conn,
...
@@ -2883,6 +2889,9 @@ virDomainNetDefFormat(virConnectPtr conn,
case
VIR_DOMAIN_NET_TYPE_BRIDGE
:
case
VIR_DOMAIN_NET_TYPE_BRIDGE
:
virBufferEscapeString
(
buf
,
" <source bridge='%s'/>
\n
"
,
virBufferEscapeString
(
buf
,
" <source bridge='%s'/>
\n
"
,
def
->
data
.
bridge
.
brname
);
def
->
data
.
bridge
.
brname
);
if
(
def
->
data
.
bridge
.
script
)
virBufferEscapeString
(
buf
,
" <script path='%s'/>
\n
"
,
def
->
data
.
bridge
.
script
);
break
;
break
;
case
VIR_DOMAIN_NET_TYPE_SERVER
:
case
VIR_DOMAIN_NET_TYPE_SERVER
:
...
...
src/domain_conf.h
浏览文件 @
fb4ec823
...
@@ -154,6 +154,7 @@ struct _virDomainNetDef {
...
@@ -154,6 +154,7 @@ struct _virDomainNetDef {
}
network
;
}
network
;
struct
{
struct
{
char
*
brname
;
char
*
brname
;
char
*
script
;
}
bridge
;
}
bridge
;
}
data
;
}
data
;
char
*
ifname
;
char
*
ifname
;
...
...
src/xend_internal.c
浏览文件 @
fb4ec823
...
@@ -61,6 +61,12 @@
...
@@ -61,6 +61,12 @@
#endif
/* PROXY */
#endif
/* PROXY */
#ifdef __sun
#define DEFAULT_VIF_SCRIPT "vif-vnic"
#else
#define DEFAULT_VIF_SCRIPT "vif-bridge"
#endif
#ifdef WITH_RHEL5_API
#ifdef WITH_RHEL5_API
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
...
@@ -1739,15 +1745,22 @@ xenDaemonParseSxprNets(virConnectPtr conn,
...
@@ -1739,15 +1745,22 @@ xenDaemonParseSxprNets(virConnectPtr conn,
if
(
VIR_ALLOC
(
net
)
<
0
)
if
(
VIR_ALLOC
(
net
)
<
0
)
goto
no_memory
;
goto
no_memory
;
if
(
(
tmp2
&&
strstr
(
tmp2
,
"bridge"
))
||
tmp
)
{
if
(
tmp
!=
NULL
||
(
STREQ
(
tmp2
,
DEFAULT_VIF_SCRIPT
))
)
{
net
->
type
=
VIR_DOMAIN_NET_TYPE_BRIDGE
;
net
->
type
=
VIR_DOMAIN_NET_TYPE_BRIDGE
;
/* XXX virtual network reverse resolve */
/* XXX virtual network reverse resolve */
if
(
tmp
&&
if
(
tmp
&&
!
(
net
->
data
.
bridge
.
brname
=
strdup
(
tmp
)))
!
(
net
->
data
.
bridge
.
brname
=
strdup
(
tmp
)))
goto
no_memory
;
goto
no_memory
;
if
(
tmp2
&&
net
->
type
==
VIR_DOMAIN_NET_TYPE_BRIDGE
&&
!
(
net
->
data
.
bridge
.
script
=
strdup
(
tmp2
)))
goto
no_memory
;
}
else
{
}
else
{
net
->
type
=
VIR_DOMAIN_NET_TYPE_ETHERNET
;
net
->
type
=
VIR_DOMAIN_NET_TYPE_ETHERNET
;
if
(
tmp2
&&
!
(
net
->
data
.
ethernet
.
script
=
strdup
(
tmp2
)))
goto
no_memory
;
}
}
tmp
=
sexpr_node
(
node
,
"device/vif/vifname"
);
tmp
=
sexpr_node
(
node
,
"device/vif/vifname"
);
...
@@ -1786,11 +1799,6 @@ xenDaemonParseSxprNets(virConnectPtr conn,
...
@@ -1786,11 +1799,6 @@ xenDaemonParseSxprNets(virConnectPtr conn,
!
(
net
->
data
.
ethernet
.
ipaddr
=
strdup
(
tmp
)))
!
(
net
->
data
.
ethernet
.
ipaddr
=
strdup
(
tmp
)))
goto
no_memory
;
goto
no_memory
;
if
(
tmp2
&&
net
->
type
==
VIR_DOMAIN_NET_TYPE_ETHERNET
&&
!
(
net
->
data
.
ethernet
.
script
=
strdup
(
tmp2
)))
goto
no_memory
;
if
(
model
&&
if
(
model
&&
!
(
net
->
model
=
strdup
(
model
)))
!
(
net
->
model
=
strdup
(
model
)))
goto
no_memory
;
goto
no_memory
;
...
@@ -5089,6 +5097,8 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
...
@@ -5089,6 +5097,8 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
int
xendConfigVersion
,
int
xendConfigVersion
,
int
isAttach
)
int
isAttach
)
{
{
const
char
*
script
=
DEFAULT_VIF_SCRIPT
;
if
(
def
->
type
!=
VIR_DOMAIN_NET_TYPE_BRIDGE
&&
if
(
def
->
type
!=
VIR_DOMAIN_NET_TYPE_BRIDGE
&&
def
->
type
!=
VIR_DOMAIN_NET_TYPE_NETWORK
&&
def
->
type
!=
VIR_DOMAIN_NET_TYPE_NETWORK
&&
def
->
type
!=
VIR_DOMAIN_NET_TYPE_ETHERNET
)
{
def
->
type
!=
VIR_DOMAIN_NET_TYPE_ETHERNET
)
{
...
@@ -5110,7 +5120,10 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
...
@@ -5110,7 +5120,10 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
switch
(
def
->
type
)
{
switch
(
def
->
type
)
{
case
VIR_DOMAIN_NET_TYPE_BRIDGE
:
case
VIR_DOMAIN_NET_TYPE_BRIDGE
:
virBufferVSprintf
(
buf
,
"(bridge '%s')"
,
def
->
data
.
bridge
.
brname
);
virBufferVSprintf
(
buf
,
"(bridge '%s')"
,
def
->
data
.
bridge
.
brname
);
virBufferAddLit
(
buf
,
"(script 'vif-bridge')"
);
if
(
def
->
data
.
bridge
.
script
)
script
=
def
->
data
.
bridge
.
script
;
virBufferVSprintf
(
buf
,
"(script '%s')"
,
script
);
break
;
break
;
case
VIR_DOMAIN_NET_TYPE_NETWORK
:
case
VIR_DOMAIN_NET_TYPE_NETWORK
:
...
@@ -5133,7 +5146,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
...
@@ -5133,7 +5146,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
return
-
1
;
return
-
1
;
}
}
virBufferVSprintf
(
buf
,
"(bridge '%s')"
,
bridge
);
virBufferVSprintf
(
buf
,
"(bridge '%s')"
,
bridge
);
virBuffer
AddLit
(
buf
,
"(script 'vif-bridge')"
);
virBuffer
VSprintf
(
buf
,
"(script '%s')"
,
script
);
VIR_FREE
(
bridge
);
VIR_FREE
(
bridge
);
}
}
break
;
break
;
...
...
src/xm_internal.c
浏览文件 @
fb4ec823
...
@@ -1075,15 +1075,20 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
...
@@ -1075,15 +1075,20 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
net
->
mac
[
5
]
=
rawmac
[
5
];
net
->
mac
[
5
]
=
rawmac
[
5
];
}
}
if
(
bridge
[
0
]
||
STREQ
(
script
,
"vif-bridge"
))
if
(
bridge
[
0
]
||
STREQ
(
script
,
"vif-bridge"
)
||
STREQ
(
script
,
"vif-vnic"
))
{
net
->
type
=
VIR_DOMAIN_NET_TYPE_BRIDGE
;
net
->
type
=
VIR_DOMAIN_NET_TYPE_BRIDGE
;
else
}
else
{
net
->
type
=
VIR_DOMAIN_NET_TYPE_ETHERNET
;
net
->
type
=
VIR_DOMAIN_NET_TYPE_ETHERNET
;
}
if
(
net
->
type
==
VIR_DOMAIN_NET_TYPE_BRIDGE
)
{
if
(
net
->
type
==
VIR_DOMAIN_NET_TYPE_BRIDGE
)
{
if
(
bridge
[
0
]
&&
if
(
bridge
[
0
]
&&
!
(
net
->
data
.
bridge
.
brname
=
strdup
(
bridge
)))
!
(
net
->
data
.
bridge
.
brname
=
strdup
(
bridge
)))
goto
no_memory
;
goto
no_memory
;
if
(
script
[
0
]
&&
!
(
net
->
data
.
bridge
.
script
=
strdup
(
script
)))
goto
no_memory
;
}
else
{
}
else
{
if
(
script
[
0
]
&&
if
(
script
[
0
]
&&
!
(
net
->
data
.
ethernet
.
script
=
strdup
(
script
)))
!
(
net
->
data
.
ethernet
.
script
=
strdup
(
script
)))
...
...
tests/sexpr2xmldata/sexpr2xml-curmem.xml
浏览文件 @
fb4ec823
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1d:06:15'
/>
<mac
address=
'00:16:3e:1d:06:15'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif5.0'
/>
<target
dev=
'vif5.0'
/>
</interface>
</interface>
<console
type=
'pty'
>
<console
type=
'pty'
>
...
...
tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
浏览文件 @
fb4ec823
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:23:9e:eb'
/>
<mac
address=
'00:16:3e:23:9e:eb'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif6.0'
/>
<target
dev=
'vif6.0'
/>
</interface>
</interface>
<console
type=
'pty'
>
<console
type=
'pty'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif3.0'
/>
<target
dev=
'vif3.0'
/>
</interface>
</interface>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<parallel
type=
'tcp'
>
<parallel
type=
'tcp'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'file'
>
<serial
type=
'file'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'null'
>
<serial
type=
'null'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'pipe'
>
<serial
type=
'pipe'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'pty'
>
<serial
type=
'pty'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'stdio'
>
<serial
type=
'stdio'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'tcp'
>
<serial
type=
'tcp'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'tcp'
>
<serial
type=
'tcp'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'udp'
>
<serial
type=
'udp'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif1.0'
/>
<target
dev=
'vif1.0'
/>
</interface>
</interface>
<serial
type=
'unix'
>
<serial
type=
'unix'
>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif3.0'
/>
<target
dev=
'vif3.0'
/>
</interface>
</interface>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif3.0'
/>
<target
dev=
'vif3.0'
/>
</interface>
</interface>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif3.0'
/>
<target
dev=
'vif3.0'
/>
</interface>
</interface>
<input
type=
'mouse'
bus=
'usb'
/>
<input
type=
'mouse'
bus=
'usb'
/>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif3.0'
/>
<target
dev=
'vif3.0'
/>
</interface>
</interface>
<input
type=
'tablet'
bus=
'usb'
/>
<input
type=
'tablet'
bus=
'usb'
/>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif3.0'
/>
<target
dev=
'vif3.0'
/>
</interface>
</interface>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
...
...
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif3.0'
/>
<target
dev=
'vif3.0'
/>
</interface>
</interface>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
...
...
tests/sexpr2xmldata/sexpr2xml-fv.xml
浏览文件 @
fb4ec823
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<mac
address=
'00:16:3e:1b:b1:47'
/>
<source
bridge=
'xenbr0'
/>
<source
bridge=
'xenbr0'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif3.0'
/>
<target
dev=
'vif3.0'
/>
</interface>
</interface>
<input
type=
'mouse'
bus=
'ps2'
/>
<input
type=
'mouse'
bus=
'ps2'
/>
...
...
tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
浏览文件 @
fb4ec823
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:11:22:33:44:55'
/>
<mac
address=
'00:11:22:33:44:55'
/>
<source
bridge=
'xenbr2'
/>
<source
bridge=
'xenbr2'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif6.0'
/>
<target
dev=
'vif6.0'
/>
</interface>
</interface>
<console
type=
'pty'
>
<console
type=
'pty'
>
...
...
tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
浏览文件 @
fb4ec823
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
<interface
type=
'bridge'
>
<interface
type=
'bridge'
>
<mac
address=
'00:11:22:33:44:55'
/>
<mac
address=
'00:11:22:33:44:55'
/>
<source
bridge=
'xenbr2'
/>
<source
bridge=
'xenbr2'
/>
<script
path=
'vif-bridge'
/>
<target
dev=
'vif6.0'
/>
<target
dev=
'vif6.0'
/>
<model
type=
'e1000'
/>
<model
type=
'e1000'
/>
</interface>
</interface>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录