提交 1109ba44 编写于 作者: D Daniel P. Berrange

Fixed bridge networking for QEMU

上级 348209ca
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> 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 * src/xen_internal.c: Fix handling of PAE flags in capabilities XML
......
...@@ -508,7 +508,7 @@ static struct qemud_vm_net_def *qemudParseInterfaceXML(struct qemud_server *serv ...@@ -508,7 +508,7 @@ static struct qemud_vm_net_def *qemudParseInterfaceXML(struct qemud_server *serv
} else if ((network == NULL) && } else if ((network == NULL) &&
(net->type == QEMUD_NET_BRIDGE) && (net->type == QEMUD_NET_BRIDGE) &&
(xmlStrEqual(cur->name, BAD_CAST "source"))) { (xmlStrEqual(cur->name, BAD_CAST "source"))) {
bridge = xmlGetProp(cur, BAD_CAST "dev"); bridge = xmlGetProp(cur, BAD_CAST "bridge");
} else if ((network == NULL) && } else if ((network == NULL) &&
((net->type == QEMUD_NET_SERVER) || ((net->type == QEMUD_NET_SERVER) ||
(net->type == QEMUD_NET_CLIENT) || (net->type == QEMUD_NET_CLIENT) ||
...@@ -2549,7 +2549,7 @@ char *qemudGenerateXML(struct qemud_server *server, ...@@ -2549,7 +2549,7 @@ char *qemudGenerateXML(struct qemud_server *server,
break; break;
case QEMUD_NET_BRIDGE: 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; goto no_memory;
if (net->dst.bridge.ifname[0] != '\0') { if (net->dst.bridge.ifname[0] != '\0') {
if (bufferVSprintf(buf, " <target dev='%s'/>\n", net->dst.bridge.ifname) < 0) if (bufferVSprintf(buf, " <target dev='%s'/>\n", net->dst.bridge.ifname) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册