From 1109ba44e2e468a8b8b08b49015c2f3a46d90af2 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 27 Mar 2007 14:46:45 +0000 Subject: [PATCH] Fixed bridge networking for QEMU --- ChangeLog | 6 ++++++ qemud/conf.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8491d7f926..64ac1f0d04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Mar 27 10:46:00 EDT 2007 Daniel P. Berrange + + * qemud/conf.c: Fixed bridged config to refer to 'bridge' attribute + instead of 'dev' attribte on the element, thus complying + with schema. + Tue Mar 27 10:39:00 EDT 2007 Daniel P. Berrange * src/xen_internal.c: Fix handling of PAE flags in capabilities XML diff --git a/qemud/conf.c b/qemud/conf.c index 5136001c5c..41ee7a3f9c 100644 --- 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, " \n", net->dst.bridge.brname) < 0) + if (bufferVSprintf(buf, " \n", net->dst.bridge.brname) < 0) goto no_memory; if (net->dst.bridge.ifname[0] != '\0') { if (bufferVSprintf(buf, " \n", net->dst.bridge.ifname) < 0)