External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix XM driver VIF config creation

Browse Source
This commit is contained in:
Daniel P. Berrange 2009-04-24 12:17:50 +00:00
parent 741fecedaa
commit 1fbee8dadf
57 changed files with 91 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Fri Apr 24 13:17:47 BST 2009 Daniel P. Berrange <berrange@redhat.com>
Fix network config in XM driver
* src/xm_internal.c: Fix setting of bridge & script parameters
in VIF config
* src/xend_internal.h, src/xend_internal.c: Export the
default bridge script name to XM driver
* tests/xmconfigdata/*: Update to take account of script=
setting in VIF config
Fri Apr 24 12:06:47 CEST 2009 Daniel Veillard <veillard@redhat.com>
* po/*: updated a could of locale, regenerated

6
src/xend_internal.c
View File

@ -61,12 +61,6 @@
#endif /* PROXY */
#ifdef __sun
#define DEFAULT_VIF_SCRIPT "vif-vnic"
#else
#define DEFAULT_VIF_SCRIPT "vif-bridge"
#endif
#ifdef WITH_RHEL5_API
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2

6
src/xend_internal.h
View File

@ -27,6 +27,12 @@
#include "driver.h"
#include "buf.h"
#ifdef __sun
#define DEFAULT_VIF_SCRIPT "vif-vnic"
#else
#define DEFAULT_VIF_SCRIPT "vif-bridge"
#endif
int
xenDaemonOpen_unix(virConnectPtr conn, const char *path);

23
src/xm_internal.c
View File

@ -1980,6 +1980,7 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn,
virBufferVSprintf(&buf, ",bridge=%s", net->data.bridge.brname);
if (net->data.bridge.ipaddr)
virBufferVSprintf(&buf, ",ip=%s", net->data.bridge.ipaddr);
virBufferVSprintf(&buf, ",script=%s", DEFAULT_VIF_SCRIPT);
break;
case VIR_DOMAIN_NET_TYPE_ETHERNET:
@ -1990,7 +1991,27 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn,
break;
case VIR_DOMAIN_NET_TYPE_NETWORK:
break;
{
virNetworkPtr network = virNetworkLookupByName(conn, net->data.network.name);
char *bridge;
if (!network) {
xenXMError(conn, VIR_ERR_NO_NETWORK, "%s",
net->data.network.name);
return -1;
}
bridge = virNetworkGetBridgeName(network);
virNetworkFree(network);
if (!bridge) {
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
_("network %s is not active"),
net->data.network.name);
return -1;
}
virBufferVSprintf(&buf, ",bridge=%s", bridge);
virBufferVSprintf(&buf, ",script=%s", DEFAULT_VIF_SCRIPT);
}
break;
default:
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,

2
tests/xmconfigdata/test-escape-paths.cfg
View File

@ -20,7 +20,7 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso&test,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "none"
soundhw = "sb16,es1370"

1
tests/xmconfigdata/test-escape-paths.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

2
tests/xmconfigdata/test-fullvirt-localtime.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "none"

1
tests/xmconfigdata/test-fullvirt-localtime.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

2
tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "none"

1
tests/xmconfigdata/test-fullvirt-new-cdrom.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

2
tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
View File

@ -21,6 +21,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,ioemu:hda,w" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr0,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr0,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "none"

1
tests/xmconfigdata/test-fullvirt-old-cdrom.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr0'/>
<script path='vif-bridge'/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

2
tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "tcp:127.0.0.1:7777"
serial = "none"

1
tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<parallel type='tcp'>
<source mode='connect' host='127.0.0.1' service='7777'/>

2
tests/xmconfigdata/test-fullvirt-serial-file.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "file:/tmp/serial.log"

1
tests/xmconfigdata/test-fullvirt-serial-file.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='file'>
<source path='/tmp/serial.log'/>

2
tests/xmconfigdata/test-fullvirt-serial-null.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "null"

1
tests/xmconfigdata/test-fullvirt-serial-null.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='null'>
<target port='0'/>

2
tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "pipe:/tmp/serial.pipe"

1
tests/xmconfigdata/test-fullvirt-serial-pipe.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='pipe'>
<source path='/tmp/serial.pipe'/>

2
tests/xmconfigdata/test-fullvirt-serial-pty.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "pty"

1
tests/xmconfigdata/test-fullvirt-serial-pty.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='pty'>
<target port='0'/>

2
tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "stdio"

1
tests/xmconfigdata/test-fullvirt-serial-stdio.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='stdio'>
<target port='0'/>

2
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "telnet:127.0.0.1:9999,listen"

1
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='tcp'>
<source mode='bind' host='127.0.0.1' service='9999'/>

2
tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "tcp:127.0.0.1:7777"

1
tests/xmconfigdata/test-fullvirt-serial-tcp.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='7777'/>

2
tests/xmconfigdata/test-fullvirt-serial-udp.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "udp:127.0.0.1:9999@0.0.0.0:99998"

1
tests/xmconfigdata/test-fullvirt-serial-udp.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='udp'>
<source mode='bind' host='0.0.0.0' service='99998'/>

2
tests/xmconfigdata/test-fullvirt-serial-unix.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "unix:/tmp/serial.sock,listen"

1
tests/xmconfigdata/test-fullvirt-serial-unix.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<serial type='unix'>
<source mode='bind' path='/tmp/serial.sock'/>

2
tests/xmconfigdata/test-fullvirt-sound.cfg
View File

@ -20,7 +20,7 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "none"
soundhw = "sb16,es1370"

1
tests/xmconfigdata/test-fullvirt-sound.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

2
tests/xmconfigdata/test-fullvirt-usbmouse.cfg
View File

@ -22,6 +22,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "none"

1
tests/xmconfigdata/test-fullvirt-usbmouse.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<input type='mouse' bus='usb'/>
<input type='mouse' bus='ps2'/>

1
tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<input type='tablet'/>
<input type='mouse' bus='ps2'/>

2
tests/xmconfigdata/test-fullvirt-usbtablet.cfg
View File

@ -22,6 +22,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "none"

1
tests/xmconfigdata/test-fullvirt-usbtablet.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>

2
tests/xmconfigdata/test-fullvirt-utc.cfg
View File

@ -20,6 +20,6 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,type=ioemu" ]
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "none"

1
tests/xmconfigdata/test-fullvirt-utc.xml
View File

@ -34,6 +34,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>
<script path='vif-bridge'/>
</interface>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

2
tests/xmconfigdata/test-no-source-cdrom.cfg
View File

@ -18,6 +18,6 @@ sdl = 0
vnc = 1
vncunused = 1
disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,type=ioemu" ]
vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,type=ioemu" ]
parallel = "none"
serial = "pty"

1
tests/xmconfigdata/test-no-source-cdrom.xml
View File

@ -33,6 +33,7 @@
<interface type='bridge'>
<mac address='00:16:3e:0a:7b:39'/>
<source bridge='xenbr0'/>
<script path='vif-bridge'/>
</interface>
<serial type='pty'>
<target port='0'/>

2
tests/xmconfigdata/test-paravirt-net-e1000.cfg
View File

@ -9,4 +9,4 @@ on_reboot = "restart"
on_crash = "restart"
vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,model=e1000" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge,model=e1000" ]

1
tests/xmconfigdata/test-paravirt-net-e1000.xml
View File

@ -21,6 +21,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:94:9c'/>
<source bridge='br0'/>
<script path='vif-bridge'/>
<model type='e1000'/>
</interface>
<console type='pty'>

2
tests/xmconfigdata/test-paravirt-net-vifname.cfg
View File

@ -9,4 +9,4 @@ on_reboot = "restart"
on_crash = "restart"
vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,model=e1000,vifname=net0" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge,model=e1000,vifname=net0" ]

1
tests/xmconfigdata/test-paravirt-net-vifname.xml
View File

@ -21,6 +21,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:94:9c'/>
<source bridge='br0'/>
<script path='vif-bridge'/>
<target dev='net0'/>
<model type='e1000'/>
</interface>

2
tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
View File

@ -9,4 +9,4 @@ on_reboot = "restart"
on_crash = "restart"
vfb = [ "type=vnc,vncunused=0,vncdisplay=25,vnclisten=127.0.0.1,vncpasswd=123poi" ]
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]

1
tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
View File

@ -21,6 +21,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:94:9c'/>
<source bridge='br0'/>
<script path='vif-bridge'/>
</interface>
<console type='pty'>
<target port='0'/>

2
tests/xmconfigdata/test-paravirt-new-pvfb.cfg
View File

@ -9,4 +9,4 @@ on_reboot = "restart"
on_crash = "restart"
vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]

1
tests/xmconfigdata/test-paravirt-new-pvfb.xml
View File

@ -21,6 +21,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:94:9c'/>
<source bridge='br0'/>
<script path='vif-bridge'/>
</interface>
<console type='pty'>
<target port='0'/>

2
tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
View File

@ -14,4 +14,4 @@ vncdisplay = 25
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]

1
tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
View File

@ -21,6 +21,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:94:9c'/>
<source bridge='br0'/>
<script path='vif-bridge'/>
</interface>
<console type='pty'>
<target port='0'/>

2
tests/xmconfigdata/test-paravirt-old-pvfb.cfg
View File

@ -13,4 +13,4 @@ vncunused = 1
vnclisten = "127.0.0.1"
vncpasswd = "123poi"
disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0" ]
vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]

1
tests/xmconfigdata/test-paravirt-old-pvfb.xml
View File

@ -21,6 +21,7 @@
<interface type='bridge'>
<mac address='00:16:3e:66:94:9c'/>
<source bridge='br0'/>
<script path='vif-bridge'/>
</interface>
<console type='pty'>
<target port='0'/>

2
tests/xmconfigdata/test-pci-devs.cfg
View File

@ -18,7 +18,7 @@ sdl = 0
vnc = 1
vncunused = 1
disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ]
vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,type=ioemu" ]
vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,type=ioemu" ]
pci = [ "0001:0c:1b.2", "0000:01:13.0" ]
parallel = "none"
serial = "pty"

1
tests/xmconfigdata/test-pci-devs.xml
View File

@ -33,6 +33,7 @@
<interface type='bridge'>
<mac address='00:16:3e:0a:7b:39'/>
<source bridge='xenbr0'/>
<script path='vif-bridge'/>
</interface>
<serial type='pty'>
<target port='0'/>