Tue Aug 21 09:45:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

        * src/xend_internal.c: Return the interface device name as
          <target dev='vifX.Y'/> in domain XML.
        * tests/*: Update XML in regression tests.

diff --git a/ChangeLog b/ChangeLog
index 5da317c60c78a8a63e2627940daa90bfd0f04e8a..ab6314ba3b7d351cd07d60f71d1ce289a622d489 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 21 09:45:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/xend_internal.c: Return the interface device name as
+         <target dev='vifX.Y'/> in domain XML.
+       * tests/*: Update XML in regression tests.
+
 Tue Aug 21 09:07:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * docs/libvir.html: Updated the hvsupport page to show that

diff --git a/src/xend_internal.c b/src/xend_internal.c
index b77afa8d1ac601e097b17c3481b504719346e97b..dfeab67c09ecaf57c195683831cacff414003686 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1354,6 +1354,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, int xendConfigVersi
     int max_mem, cur_mem;
     unsigned char uuid[VIR_UUID_BUFLEN];
     char uuidstr[VIR_UUID_STRING_BUFLEN];
+    int vif_index = 0;
 
     if (root == NULL) {
         /* ERROR */
@@ -1626,6 +1627,9 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, int xendConfigVersi
             if (tmp)
                 virBufferVSprintf(&buf, "      <target dev='%s'/>\n",
                                   tmp);
+            else
+                virBufferVSprintf(&buf, "      <target dev='vif%d.%d'/>\n",
+                                  domid, vif_index);
             tmp = sexpr_node(node, "device/vif/mac");
             if (tmp)
                 virBufferVSprintf(&buf, "      <mac address='%s'/>\n",
@@ -1639,6 +1643,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, int xendConfigVersi
                                   tmp2);
 
             virBufferAdd(&buf, "    </interface>\n", 17);
+            vif_index++;
         } else if (sexpr_lookup(node, "device/vfb")) {
             /* New style graphics config for PV guests in >= 3.0.4,
              * or for HVM guests in >= 3.0.5 */

diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
index 8c46e18a84a928467367545dfbd6dcee328f4833..15853cd82738de93891bd2a3a19a2dd57213b021 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
@@ -17,6 +17,7 @@
   <devices>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
+      <target dev='vif5.0'/>
       <mac address='00:16:3e:1d:06:15'/>
       <script path='vif-bridge'/>
     </interface>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
index a6ebc1a468c2abe6a82574a97d65dd99ba7789dd..051097f781f689e89692c2815bc183ccf77a3245 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -24,6 +24,7 @@
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
       <mac address='00:16:3e:1b:b1:47'/>
       <script path='vif-bridge'/>
     </interface>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
index 4b9e1e4dfc329a60efd15c43f6b15a98371cb3ce..a2eb84b674d62edc137d67860c7b9b515b73241d 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -24,6 +24,7 @@
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
       <mac address='00:16:3e:1b:b1:47'/>
       <script path='vif-bridge'/>
     </interface>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
index 5567e19196b51a3ab0460685e284f98dc2a76b86..714e890f2081a75475c36276b197a851f66c3786 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -24,6 +24,7 @@
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
       <mac address='00:16:3e:1b:b1:47'/>
       <script path='vif-bridge'/>
     </interface>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
index 0382a69f5be9bbf31c90f58fc3ced1616453935c..f11571d7ab9bafe29af04b0b2e2e90ddb43f3267 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -24,6 +24,7 @@
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
       <mac address='00:16:3e:1b:b1:47'/>
       <script path='vif-bridge'/>
     </interface>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
index 8a89770b2ceb39c6e3217a0de714495a97ce9e64..c4c4a360836925c0ccd3f6df578ad91baa8318d4 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -30,6 +30,7 @@
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
       <mac address='00:16:3e:1b:b1:47'/>
       <script path='vif-bridge'/>
     </interface>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
index 0382a69f5be9bbf31c90f58fc3ced1616453935c..f11571d7ab9bafe29af04b0b2e2e90ddb43f3267 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -24,6 +24,7 @@
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
+      <target dev='vif3.0'/>
       <mac address='00:16:3e:1b:b1:47'/>
       <script path='vif-bridge'/>
     </interface>

diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
index 4eb2d186f48c2024a6ac9c9f293f97d9f530351d..26d7badb01168fe8890ccd66602d3aec23201b4b 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
@@ -20,6 +20,7 @@
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr2'/>
+      <target dev='vif6.0'/>
       <mac address='00:11:22:33:44:55'/>
       <script path='vif-bridge'/>
     </interface>

diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
index f1a12f63d272c9d85825c5fde25c84b3d5a01970..74dad9f535ce80c8657bf306ee8c5f9053e3a9e4 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
@@ -19,6 +19,7 @@
       <target dev='xvda'/>
     </disk>
     <interface type='ethernet'>
+      <target dev='vif6.0'/>
       <mac address='00:11:22:33:44:55'/>
       <ip address='172.14.5.6'/>
       <script path='vif-routed'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index ea77f57cfd2a5c6d08d0e53f91fbee8ac8a487f0..429474aff26103adfc2326b1afc3592fbdf09fbc 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -22,6 +22,7 @@
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
+      <target dev='vif6.0'/>
       <mac address='00:16:3e:0a:7b:39'/>
     </interface>
     <disk type='block' device='disk'>

diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 26f4f0bb11f7ac4073432917e8672bc16bd36494..93d1cd27253fdb85477a42ffe5e3f9881cba7a0c 100644 (file)
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -30,6 +30,7 @@ static int testCompareFiles(const char *xml, const char *sexpr, int xendConfigVe
 
   if (strcmp(xmlData, gotxml)) {
     if (getenv("DEBUG_TESTS")) {
+       printf("In test file %s -> %s:\n", sexpr, xml);
         printf("Expect %d '%s'\n", (int)strlen(xmlData), xmlData);
         printf("Actual %d '%s'\n", (int)strlen(gotxml), gotxml);
     }