Fixed bridge networking for QEMU

diff --git a/ChangeLog b/ChangeLog
index 8491d7f926ef5d7a5c3bed6ed041669a6fe912f5..64ac1f0d049ea48e94cea71347339b4f96b615a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 27 10:46:00 EDT 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * qemud/conf.c: Fixed bridged config to refer to 'bridge' attribute
+       instead of 'dev' attribte on the <source> element, thus complying
+       with schema.
+
 Tue Mar 27 10:39:00 EDT 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * src/xen_internal.c: Fix handling of PAE flags in capabilities XML

diff --git a/qemud/conf.c b/qemud/conf.c
index 5136001c5c19150e8374a6c6332fc1cffc1e9e6d..41ee7a3f9cd8c1519981472b35045894d6a92dfb 100644 (file)
--- a/qemud/conf.c
+++ b/qemud/conf.c
@@ -508,7 +508,7 @@ static struct qemud_vm_net_def *qemudParseInterfaceXML(struct qemud_server *serv
             } else if ((network == NULL) &&
                        (net->type == QEMUD_NET_BRIDGE) &&
                        (xmlStrEqual(cur->name, BAD_CAST "source"))) {
-                bridge = xmlGetProp(cur, BAD_CAST "dev");
+                bridge = xmlGetProp(cur, BAD_CAST "bridge");
             } else if ((network == NULL) &&
                        ((net->type == QEMUD_NET_SERVER) ||
                         (net->type == QEMUD_NET_CLIENT) ||
@@ -2549,7 +2549,7 @@ char *qemudGenerateXML(struct qemud_server *server,
             break;
 
         case QEMUD_NET_BRIDGE:
-            if (bufferVSprintf(buf, "      <source dev='%s'/>\n", net->dst.bridge.brname) < 0)
+            if (bufferVSprintf(buf, "      <source bridge='%s'/>\n", net->dst.bridge.brname) < 0)
                 goto no_memory;
             if (net->dst.bridge.ifname[0] != '\0') {
                 if (bufferVSprintf(buf, "      <target dev='%s'/>\n", net->dst.bridge.ifname) < 0)