On Mon, Apr 20, 2009 at 12:58:57PM -0700, Kaitlin Rupert wrote:
> Daniel P. Berrange wrote:
> >On Mon, Apr 20, 2009 at 12:06:16PM -0700, Kaitlin Rupert wrote:
> >>Daniel P. Berrange wrote:
> >>>On Fri, Apr 17, 2009 at 01:29:12PM -0700, Kaitlin Rupert wrote:
> >>>>Hi,
> >>>>
> >>>>I'm using libvirt 0.6.2 to create a Xen guest with a network type
> >>>>interface (see XML below). When the guest is defined, the interface is
> >>>>converted to an ethernet type interface. If the guest is started, the
> >>>>interface is then converted to a bridge type interface.
> >>>This sounds bad :-) Can you provide the output of 'xm list --long
> >>>hd_domain'
> >>>immediately after defining it, and then again immediately after starting
> >>>the guest.
> >>>
> >>Here's the whole create process. Probably more than you needed, but
> >>included for clarity ;)
> >>
> >>
> >># virsh list --all
> >> Id Name State
> >>----------------------------------
> >> 0 Domain-0 running
> >>
> >># virsh define hd_domain
> >>Domain hd_domain defined from hd_domain
> >>
> >># xm list --long hd_domain
> >>Error: Domain 'hd_domain' does not exist.
> >>Usage: xm list [options] [Domain, ...]
> >>
> >>List information about all/some domains.
> >> -l, --long Output all VM details in SXP
> >>
> >> --label Include security labels
> >
> >I guess you muyst be using an old Xen without inactive domain
> >support ? Would this be RHEL-5 Xen by chance ? If so, can you
> >also provide the /etc/xen/$GUESTNAME config file at this point
>
> Yes, this is with RHEL 5 - I meant to mention that in my original mail.
>
> # cat /etc/xen/hd_domain
> name = "hd_domain"
> uuid = "f99fd6b6-1434-4bc2-88e0-1ed9c8c6f8e9"
> maxmem = 128
> memory = 128
> vcpus = 1
> kernel = "/tmp/default-xen-kernel"
> ramdisk = "/tmp/default-xen-initrd"
> on_poweroff = "destroy"
> on_reboot = "restart"
> on_crash = "destroy"
> vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,keymap=en-us" ]
> disk = [ "file:/tmp/default-xen-dimage,xvda,w" ]
> vif = [ "mac=00:11:22:33:44:aa" ]
So its obvious what the problem is here - we're not writing out any
bridge info at all. Turns out this chunk of code was just plain
missing
This patch makes sure that we write the correct info the /etc/xen
config file. This will make sure it at least shows up as type=bridge.
The harder bit is to make it correctly round-trip, so it shows up
as type=network again. This particular aspect has never worked
in the Xen driver and will be a more involved fix. We need to add
an API to translate froma bridge device name back to a virNetworkPtr
object, otherwise its just horribly inefficient. THis will have to
wait till next release.
Daniel
Index: src/xend_internal.c
===================================================================
RCS file: /data/cvs/libvirt/src/xend_internal.c,v
retrieving revision 1.259
diff -u -p -r1.259 xend_internal.c
--- src/xend_internal.c 21 Apr 2009 15:10:23 -0000 1.259
+++ src/xend_internal.c 23 Apr 2009 13:16:00 -0000
@@ -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
Index: src/xend_internal.h
===================================================================
RCS file: /data/cvs/libvirt/src/xend_internal.h,v
retrieving revision 1.56
diff -u -p -r1.56 xend_internal.h
--- src/xend_internal.h 17 Dec 2008 21:26:16 -0000 1.56
+++ src/xend_internal.h 23 Apr 2009 13:16:00 -0000
@@ -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);
Index: src/xm_internal.c
===================================================================
RCS file: /data/cvs/libvirt/src/xm_internal.c,v
retrieving revision 1.124
diff -u -p -r1.124 xm_internal.c
--- src/xm_internal.c 15 Apr 2009 09:53:34 -0000 1.124
+++ src/xm_internal.c 23 Apr 2009 13:16:00 -0000
@@ -1980,6 +1991,7 @@ static int xenXMDomainConfigFormatNet(vi
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 +2002,27 @@ static int xenXMDomainConfigFormatNet(vi
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,
Index: tests/xmconfigdata/test-escape-paths.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-escape-paths.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-escape-paths.cfg
--- tests/xmconfigdata/test-escape-paths.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-escape-paths.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-escape-paths.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-escape-paths.xml,v
retrieving revision 1.2
diff -u -p -r1.2 test-escape-paths.xml
--- tests/xmconfigdata/test-escape-paths.xml 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-escape-paths.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-localtime.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-localtime.cfg,v
retrieving revision 1.4
diff -u -p -r1.4 test-fullvirt-localtime.cfg
--- tests/xmconfigdata/test-fullvirt-localtime.cfg 25 Jul 2008 13:39:02 -0000 1.4
+++ tests/xmconfigdata/test-fullvirt-localtime.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-localtime.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-localtime.xml,v
retrieving revision 1.5
diff -u -p -r1.5 test-fullvirt-localtime.xml
--- tests/xmconfigdata/test-fullvirt-localtime.xml 25 Jul 2008 13:39:02 -0000 1.5
+++ tests/xmconfigdata/test-fullvirt-localtime.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg,v
retrieving revision 1.6
diff -u -p -r1.6 test-fullvirt-new-cdrom.cfg
--- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg 25 Jul 2008 13:39:02 -0000 1.6
+++ tests/xmconfigdata/test-fullvirt-new-cdrom.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-new-cdrom.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-new-cdrom.xml,v
retrieving revision 1.8
diff -u -p -r1.8 test-fullvirt-new-cdrom.xml
--- tests/xmconfigdata/test-fullvirt-new-cdrom.xml 25 Jul 2008 13:39:02 -0000 1.8
+++ tests/xmconfigdata/test-fullvirt-new-cdrom.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg,v
retrieving revision 1.6
diff -u -p -r1.6 test-fullvirt-old-cdrom.cfg
--- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg 25 Jul 2008 13:39:02 -0000 1.6
+++ tests/xmconfigdata/test-fullvirt-old-cdrom.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-old-cdrom.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-old-cdrom.xml,v
retrieving revision 1.8
diff -u -p -r1.8 test-fullvirt-old-cdrom.xml
--- tests/xmconfigdata/test-fullvirt-old-cdrom.xml 25 Jul 2008 13:39:02 -0000 1.8
+++ tests/xmconfigdata/test-fullvirt-old-cdrom.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-parallel-tcp.cfg
--- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-parallel-tcp.xml
--- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-parallel-tcp.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-file.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-file.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-file.cfg
--- tests/xmconfigdata/test-fullvirt-serial-file.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-file.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-serial-file.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-file.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-file.xml
--- tests/xmconfigdata/test-fullvirt-serial-file.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-file.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-null.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-null.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-null.cfg
--- tests/xmconfigdata/test-fullvirt-serial-null.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-null.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-serial-null.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-null.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-null.xml
--- tests/xmconfigdata/test-fullvirt-serial-null.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-null.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-pipe.cfg
--- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-pipe.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-serial-pipe.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-pipe.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-pipe.xml
--- tests/xmconfigdata/test-fullvirt-serial-pipe.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-pipe.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-pty.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-pty.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-pty.cfg
--- tests/xmconfigdata/test-fullvirt-serial-pty.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-pty.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-serial-pty.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-pty.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-pty.xml
--- tests/xmconfigdata/test-fullvirt-serial-pty.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-pty.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-stdio.cfg
--- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-stdio.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-serial-stdio.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-stdio.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-stdio.xml
--- tests/xmconfigdata/test-fullvirt-serial-stdio.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-stdio.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-tcp-telnet.cfg
--- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-tcp-telnet.xml
--- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-tcp.cfg
--- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-tcp.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-serial-tcp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-tcp.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-tcp.xml
--- tests/xmconfigdata/test-fullvirt-serial-tcp.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-tcp.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-udp.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-udp.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-udp.cfg
--- tests/xmconfigdata/test-fullvirt-serial-udp.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-udp.cfg 23 Apr 2009 13:16:00 -0000
@@ -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@xxxxxxx:99998"
Index: tests/xmconfigdata/test-fullvirt-serial-udp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-udp.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-udp.xml
--- tests/xmconfigdata/test-fullvirt-serial-udp.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-udp.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-serial-unix.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-unix.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-serial-unix.cfg
--- tests/xmconfigdata/test-fullvirt-serial-unix.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-serial-unix.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-serial-unix.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-unix.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-serial-unix.xml
--- tests/xmconfigdata/test-fullvirt-serial-unix.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-serial-unix.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-sound.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-sound.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-sound.cfg
--- tests/xmconfigdata/test-fullvirt-sound.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-fullvirt-sound.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-sound.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-sound.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-sound.xml
--- tests/xmconfigdata/test-fullvirt-sound.xml 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-fullvirt-sound.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-usbmouse.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-usbmouse.cfg,v
retrieving revision 1.5
diff -u -p -r1.5 test-fullvirt-usbmouse.cfg
--- tests/xmconfigdata/test-fullvirt-usbmouse.cfg 25 Jul 2008 14:10:49 -0000 1.5
+++ tests/xmconfigdata/test-fullvirt-usbmouse.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-usbmouse.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-usbmouse.xml,v
retrieving revision 1.4
diff -u -p -r1.4 test-fullvirt-usbmouse.xml
--- tests/xmconfigdata/test-fullvirt-usbmouse.xml 25 Jul 2008 13:39:02 -0000 1.4
+++ tests/xmconfigdata/test-fullvirt-usbmouse.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml,v
retrieving revision 1.4
diff -u -p -r1.4 test-fullvirt-usbtablet-no-bus.xml
--- tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml 25 Jul 2008 13:39:02 -0000 1.4
+++ tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-usbtablet.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-usbtablet.cfg,v
retrieving revision 1.5
diff -u -p -r1.5 test-fullvirt-usbtablet.cfg
--- tests/xmconfigdata/test-fullvirt-usbtablet.cfg 25 Jul 2008 14:10:49 -0000 1.5
+++ tests/xmconfigdata/test-fullvirt-usbtablet.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-usbtablet.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-usbtablet.xml,v
retrieving revision 1.4
diff -u -p -r1.4 test-fullvirt-usbtablet.xml
--- tests/xmconfigdata/test-fullvirt-usbtablet.xml 25 Jul 2008 13:39:02 -0000 1.4
+++ tests/xmconfigdata/test-fullvirt-usbtablet.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-utc.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-utc.cfg,v
retrieving revision 1.4
diff -u -p -r1.4 test-fullvirt-utc.cfg
--- tests/xmconfigdata/test-fullvirt-utc.cfg 25 Jul 2008 13:39:02 -0000 1.4
+++ tests/xmconfigdata/test-fullvirt-utc.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-fullvirt-utc.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-utc.xml,v
retrieving revision 1.5
diff -u -p -r1.5 test-fullvirt-utc.xml
--- tests/xmconfigdata/test-fullvirt-utc.xml 25 Jul 2008 13:39:02 -0000 1.5
+++ tests/xmconfigdata/test-fullvirt-utc.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-no-source-cdrom.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-no-source-cdrom.cfg,v
retrieving revision 1.1
diff -u -p -r1.1 test-no-source-cdrom.cfg
--- tests/xmconfigdata/test-no-source-cdrom.cfg 28 Nov 2008 11:23:34 -0000 1.1
+++ tests/xmconfigdata/test-no-source-cdrom.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-no-source-cdrom.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-no-source-cdrom.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-no-source-cdrom.xml
--- tests/xmconfigdata/test-no-source-cdrom.xml 28 Nov 2008 11:23:34 -0000 1.1
+++ tests/xmconfigdata/test-no-source-cdrom.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-paravirt-net-e1000.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-net-e1000.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 test-paravirt-net-e1000.cfg
--- tests/xmconfigdata/test-paravirt-net-e1000.cfg 25 Jul 2008 13:39:02 -0000 1.2
+++ tests/xmconfigdata/test-paravirt-net-e1000.cfg 23 Apr 2009 13:16:00 -0000
@@ -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" ]
Index: tests/xmconfigdata/test-paravirt-net-e1000.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-net-e1000.xml,v
retrieving revision 1.4
diff -u -p -r1.4 test-paravirt-net-e1000.xml
--- tests/xmconfigdata/test-paravirt-net-e1000.xml 5 Sep 2008 11:52:12 -0000 1.4
+++ tests/xmconfigdata/test-paravirt-net-e1000.xml 23 Apr 2009 13:16:00 -0000
@@ -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'>
Index: tests/xmconfigdata/test-paravirt-net-vifname.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-net-vifname.cfg,v
retrieving revision 1.1
diff -u -p -r1.1 test-paravirt-net-vifname.cfg
--- tests/xmconfigdata/test-paravirt-net-vifname.cfg 1 Apr 2009 10:16:05 -0000 1.1
+++ tests/xmconfigdata/test-paravirt-net-vifname.cfg 23 Apr 2009 13:16:00 -0000
@@ -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" ]
Index: tests/xmconfigdata/test-paravirt-net-vifname.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-net-vifname.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-paravirt-net-vifname.xml
--- tests/xmconfigdata/test-paravirt-net-vifname.xml 1 Apr 2009 10:16:05 -0000 1.1
+++ tests/xmconfigdata/test-paravirt-net-vifname.xml 23 Apr 2009 13:16:00 -0000
@@ -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>
Index: tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg,v
retrieving revision 1.1
diff -u -p -r1.1 test-paravirt-new-pvfb-vncdisplay.cfg
--- tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg 9 Sep 2008 13:53:58 -0000 1.1
+++ tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg 23 Apr 2009 13:16:00 -0000
@@ -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" ]
Index: tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml,v
retrieving revision 1.2
diff -u -p -r1.2 test-paravirt-new-pvfb-vncdisplay.xml
--- tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml 17 Sep 2008 15:39:11 -0000 1.2
+++ tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-paravirt-new-pvfb.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-new-pvfb.cfg,v
retrieving revision 1.3
diff -u -p -r1.3 test-paravirt-new-pvfb.cfg
--- tests/xmconfigdata/test-paravirt-new-pvfb.cfg 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-paravirt-new-pvfb.cfg 23 Apr 2009 13:16:00 -0000
@@ -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" ]
Index: tests/xmconfigdata/test-paravirt-new-pvfb.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-new-pvfb.xml,v
retrieving revision 1.7
diff -u -p -r1.7 test-paravirt-new-pvfb.xml
--- tests/xmconfigdata/test-paravirt-new-pvfb.xml 5 Sep 2008 11:52:12 -0000 1.7
+++ tests/xmconfigdata/test-paravirt-new-pvfb.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg,v
retrieving revision 1.1
diff -u -p -r1.1 test-paravirt-old-pvfb-vncdisplay.cfg
--- tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg 9 Sep 2008 13:53:58 -0000 1.1
+++ tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg 23 Apr 2009 13:16:00 -0000
@@ -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" ]
Index: tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml,v
retrieving revision 1.2
diff -u -p -r1.2 test-paravirt-old-pvfb-vncdisplay.xml
--- tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml 17 Sep 2008 15:39:11 -0000 1.2
+++ tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-paravirt-old-pvfb.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-old-pvfb.cfg,v
retrieving revision 1.3
diff -u -p -r1.3 test-paravirt-old-pvfb.cfg
--- tests/xmconfigdata/test-paravirt-old-pvfb.cfg 25 Jul 2008 13:39:02 -0000 1.3
+++ tests/xmconfigdata/test-paravirt-old-pvfb.cfg 23 Apr 2009 13:16:00 -0000
@@ -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" ]
Index: tests/xmconfigdata/test-paravirt-old-pvfb.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-old-pvfb.xml,v
retrieving revision 1.7
diff -u -p -r1.7 test-paravirt-old-pvfb.xml
--- tests/xmconfigdata/test-paravirt-old-pvfb.xml 5 Sep 2008 11:52:12 -0000 1.7
+++ tests/xmconfigdata/test-paravirt-old-pvfb.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-pci-devs.cfg
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-pci-devs.cfg,v
retrieving revision 1.1
diff -u -p -r1.1 test-pci-devs.cfg
--- tests/xmconfigdata/test-pci-devs.cfg 3 Apr 2009 12:38:52 -0000 1.1
+++ tests/xmconfigdata/test-pci-devs.cfg 23 Apr 2009 13:16:00 -0000
@@ -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"
Index: tests/xmconfigdata/test-pci-devs.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-pci-devs.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-pci-devs.xml
--- tests/xmconfigdata/test-pci-devs.xml 3 Apr 2009 12:38:52 -0000 1.1
+++ tests/xmconfigdata/test-pci-devs.xml 23 Apr 2009 13:16:00 -0000
@@ -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'/>
>
> --
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin@xxxxxxxxxxxxxxxxxx
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list