Fix XM driver VIF config creation

diff --git a/ChangeLog b/ChangeLog
index 00bb314d3bf19365f8c6246cb4b90dc12570cf63..353ab080c8181df3d8a5d38c51d64ed16fb19379 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/src/xend_internal.c b/src/xend_internal.c
index ca8c3139acd4d2052f42343eab4b4a587069bc4c..4b327c4e75440c76dc10e083c4fa1cf95df10c5f 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -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

diff --git a/src/xend_internal.h b/src/xend_internal.h
index 19bb26888d999fb188c58d194599a371b5c976d6..9d2571bd163f82faa128c55662c6ce39135a7ee1 100644 (file)
--- a/src/xend_internal.h
+++ b/src/xend_internal.h
@@ -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);
 

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 09fe24c4bb4b26da19bb290ee6f221772550929f..38ef9b2e11e0b3582664d887e1ae333f1855bb52 100644 (file)
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -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,

diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg
index 6e2611b9f385cbe5e34e36c12761eda566c938b9..17f7f3a52229dd3a5674f64ac9438f0f72ccc02d 100644 (file)
--- a/tests/xmconfigdata/test-escape-paths.cfg
+++ b/tests/xmconfigdata/test-escape-paths.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
index 7a534baaffdbaa91a6743663855913bd7c626e37..6929ca5efc40836b9c853b5f0693a8cf90575ec9 100644 (file)
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/tests/xmconfigdata/test-escape-paths.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg
index 9fe2721d55acd65f2ef5cea756d50d2b08ded52b..4ae7fab94bc97b08a00c4bb5125bb57261eda2a5 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-localtime.cfg
+++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
index d4fa7e5bdeb6c686693862ad5c7a56dee7856ba8..8ec9b7eb6d69fa5007bf9bf025c218d92ce2c2f7 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
index 6574ee8cfdd4199d70cc502ed8ba5393ce459157..2fc4a3133dd61ec2da694fba9c4dbe853565718d 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index ab789791cb6e7afdc1ed0a7ea1c968312c73b345..e6aa053087f3434c70873be51f75aed680a97047 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
index 9f1c34c9f8881bcf7508d4d02825988080a4ef78..48b5bd5f269b535e080bc75aa19ae89b303d2c90 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
+++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
index 764157255a3fbbf8a7de7510a0b26bf825b809bc..bc76745790a516d567ed1b3fbc7765bf37e22c84 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
index 598275e53c6cacc2c545b8bd8e4421d5a78a1700..23f6111d7e58b9b4d8a8c8e8895102bb28246c62 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index 125d4921e7c1875b60873ccf7bc856434e218278..44afe028e5d87ef5a4d34fd13a7ff5a70f37af97 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
index 6467b40d3e3594385898f2949f24003656bdad7e..12589e7c0833ace13fcb79bb3069961156b07e44 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index 167241969969d529bd0ab7d4825fad15178c3839..a601ee20d1e50a6006d48cb33e07dceaedd00051 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
index 698f9bc6a15677843bc403e28c644ac8bfbca7cf..e81fe16b6de5f8f74d976964f822b2072e923662 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index b2726aeebde526f40151ed1bede95dc59603a480..94b403497df3ec2a7f31d9ebad795824bbf8f448 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
index 76b8b97dbd8da908d4314bba8c17e8a438368f55..6d678267794c6a15c720b8c11d197824528b7689 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index aa8bbca2d1daa25249136e0823042ef672e99baf..217806ad6cd6ac0ff94bb53bba2e655a9de9ca5d 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
index 713af5a99d73abe67f5bec4cd5679da3185b73e1..709e109fb9b12b8757e8f02fcec35e7bf1d605f3 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index da62122c23131261a26a4a908fb98b6a610453f0..45760874f825069301ec7a34c54cd3c49becbf9e 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
index ff3989b4b3582fd36a749090936607371e5aa0ac..77780546e092cf36b895e48a45f1bcc7d6091ae7 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index af562386ebbb69abe88a049398503095120e7f66..8717799ec866c289a41b7016c3de338b6427774b 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
index d87a02e41a43328935a7d7aef666ccdda0c13fa3..c759f3d609ec06937c0d00990759351a920798e8 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index 3c528d19eb578a9151810bb4d8c8f8d0d63d298a..52c433e91ecc690c78ea521edc057509486f8424 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
index 4f8e6c61e74041ad0aed7d26f9c4b65038ef34b4..376a204ca1788bdc57f3ac4b827ca21e22fc95c8 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index adfbe9234c5aaa79c755f759866dca7765228226..062cf54b5aa1512234f3bf6726d9b30312962e27 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
index 719aafcd619f7b305b189e54063361a672e103a0..aeb9c0f23f0f7dd8d2333849b0b166c3b4caae3e 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index 15b91547128ebe0661ad836178ee72a9d111b6e3..7871310a9646827837a2d57a5b4039d7f1935d66 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
index fa8d988c8231186621952bb25b109c7cc753a05d..3cdb22b51037ee2faf08162f3a32a129bdf300e6 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index 85bf245cd11d162938f85af38d08d8445ab9d561..e517b33b5d050b4c7c4a10b2057245722b993d65 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg
index 66b7da765c3221c7c3a707cef9bb9eea211458ef..1ca20696bde8323b2c3b9d3dabfce6f952396943 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-sound.cfg
+++ b/tests/xmconfigdata/test-fullvirt-sound.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
index 01dd65d21b7706259d04dd0c5800b87bf61f2665..81905dfc4165bc551286ed02a15283d9f2819e08 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
index e4e10fff4b9725f2418286eee866932e536b4d65..c16a70a343fb021d6e2db9580a09a2d5522d115a 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index 3d051e6672acd31b89395f4fd3d0d4be0d3a07cd..afb53a6abd6e44f92fd889450128403068fb9fc3 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
index 5a0cb69460c0e93a55218cd2f4001496f1dbff78..9370172d29b2ac5112506529c7f129f7f578d6ee 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
index 1c43aedaf26e449bf0661943614582f08d0dd521..88dfc2137e79c29ab3c620ac049772b38d460893 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index 52979bdf9009210b79a252c22a3f84b5ed9e7dc6..c40b2230c1f06ac2668ecae13d9d9af46c5881ff 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg
index 6574ee8cfdd4199d70cc502ed8ba5393ce459157..2fc4a3133dd61ec2da694fba9c4dbe853565718d 100755 (executable)
--- a/tests/xmconfigdata/test-fullvirt-utc.cfg
+++ b/tests/xmconfigdata/test-fullvirt-utc.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
index ab789791cb6e7afdc1ed0a7ea1c968312c73b345..e6aa053087f3434c70873be51f75aed680a97047 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg
index 1f200cd25942442cd96d6cb900283f6fb1ccc731..98819c425d7a78212f4eb3d029028c3a3ebfce96 100644 (file)
--- a/tests/xmconfigdata/test-no-source-cdrom.cfg
+++ b/tests/xmconfigdata/test-no-source-cdrom.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
index a28fcce0133059221ca635aefeec6835cbd2fb55..9b1dd0174c7f33b14f640a99a48edde1be501394 100644 (file)
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.cfg b/tests/xmconfigdata/test-paravirt-net-e1000.cfg
index 39a28f4d9ff31a1621856a6bedd50190ba45418e..591f2ab9235a1d17eda998749f425310d38f3892 100755 (executable)
--- a/tests/xmconfigdata/test-paravirt-net-e1000.cfg
+++ b/tests/xmconfigdata/test-paravirt-net-e1000.cfg
@@ -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" ]

diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml
index c423af12acd9042dc9ccc22c0d7f878efe8bdf70..bb8308b1829ebab90e1109da046f3d4700e2c208 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml
@@ -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'>

diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.cfg b/tests/xmconfigdata/test-paravirt-net-vifname.cfg
index 896aedfbb4b9a9ce12a53bf9ebe9739fe39a56de..3d685cad3106fadc438616f71d72285368c4a80f 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-net-vifname.cfg
+++ b/tests/xmconfigdata/test-paravirt-net-vifname.cfg
@@ -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" ]

diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml
index 55f25ac7c674c9b360b5bf0ca914d8dbbec9ca19..981457752bb972e0651ff7f517c5ce100fe12d62 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-net-vifname.xml
+++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml
@@ -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>

diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
index 35d5364203cf97ee118177bc8358e91264283f30..881ed2b322f15f774be2502dbfc81b8f0df0b89f 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
@@ -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" ]

diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
index f83d4dd62db13ddbc28ed38e346533471e638625..eb95fd43cf03ab2b52a0bb58c3a831ac8ff8feed 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.cfg b/tests/xmconfigdata/test-paravirt-new-pvfb.cfg
index b47a4ad6389f7cdcf8d57576782b9b454aab9a17..8f5e9aa1ffab5951116c10afb9b6b9c0479516de 100755 (executable)
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.cfg
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.cfg
@@ -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" ]

diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
index de1a9aecaeeb4bae8d2634fab1d9e184d22f809a..f359ba1e5560fd1b1b2d93390c2eeffd2429f6d2 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
index 9e7000b420871ef34ed55df4696e929a5b22c5de..15134ea3f1dcc0d9aed301e275bc9fd6399ee031 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
@@ -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" ]

diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
index f83d4dd62db13ddbc28ed38e346533471e638625..eb95fd43cf03ab2b52a0bb58c3a831ac8ff8feed 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg
index c60a3ea2d2e4b94aa9c7713eb871f5fcc99af2a5..b19029477c20ed4b389e72151a936ebee8deffbe 100755 (executable)
--- a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg
@@ -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" ]

diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
index de1a9aecaeeb4bae8d2634fab1d9e184d22f809a..f359ba1e5560fd1b1b2d93390c2eeffd2429f6d2 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
@@ -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'/>

diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg
index e6f1154dfef407d007a956a0f3e111cacbcbec94..1489556dd2ef1aceb768eda2f387b14740f50310 100644 (file)
--- a/tests/xmconfigdata/test-pci-devs.cfg
+++ b/tests/xmconfigdata/test-pci-devs.cfg
@@ -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"

diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index 6c44e233cc515780f7e5ae57da3830ba2b51184e..09456d033d11e6ef0a0a442c1a77cb67cae5f7f4 100644 (file)
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/tests/xmconfigdata/test-pci-devs.xml
@@ -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'/>