openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed bridge networking for QEMU

This commit is contained in:
Daniel P. Berrange 2007-03-27 14:46:45 +00:00
parent 348209ca26
commit 1109ba44e2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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

4
qemud/conf.c
View File

@ -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)