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

Tue Feb 14 16:21:18 IST 2007 Mark McLoughlin <markmc@redhat.com> 

* src/xml.c: with <interface type="network"> connect the
        Xen guest to the appropriate bridge.
This commit is contained in:
Mark McLoughlin 2007-02-14 16:22:02 +00:00
parent 8356c43e42
commit e89a1c33f5
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Feb 14 16:21:18 IST 2007 Mark McLoughlin <markmc@redhat.com>
* src/xml.c: with <interface type="network"> connect the
Xen guest to the appropriate bridge.
Tue Feb 14 16:17:51 IST 2007 Mark McLoughlin <markmc@redhat.com>
* include/libvirt/libvirt.h.in, src/libvirt.c: add

23
src/xml.c
View File

@ -842,6 +842,7 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, vi
xmlChar *script = NULL;
xmlChar *ip = NULL;
int typ = 0;
int ret = -1;
type = xmlGetProp(node, BAD_CAST "type");
if (type != NULL) {
@ -849,6 +850,8 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, vi
typ = 0;
else if (xmlStrEqual(type, BAD_CAST "ethernet"))
typ = 1;
else if (xmlStrEqual(type, BAD_CAST "network"))
typ = 2;
xmlFree(type);
}
cur = node->children;
@ -858,8 +861,10 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, vi
(xmlStrEqual(cur->name, BAD_CAST "source"))) {
if (typ == 0)
source = xmlGetProp(cur, BAD_CAST "bridge");
else
else if (typ == 1)
source = xmlGetProp(cur, BAD_CAST "dev");
else
source = xmlGetProp(cur, BAD_CAST "network");
} else if ((mac == NULL) &&
(xmlStrEqual(cur->name, BAD_CAST "mac"))) {
mac = xmlGetProp(cur, BAD_CAST "address");
@ -884,8 +889,18 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, vi
if (source != NULL) {
if (typ == 0)
virBufferVSprintf(buf, "(bridge '%s')", (const char *) source);
else /* TODO does that work like that ? */
else if (typ == 1) /* TODO does that work like that ? */
virBufferVSprintf(buf, "(dev '%s')", (const char *) source);
else {
virNetworkPtr network = virNetworkLookupByName(conn, (const char *) source);
char *bridge;
if (!network || !(bridge = virNetworkGetBridgeName(network))) {
virXMLError(conn, VIR_ERR_NO_SOURCE, (const char *) source, 0);
goto error;
}
virBufferVSprintf(buf, "(bridge '%s')", bridge);
free(bridge);
}
}
if (script != NULL)
virBufferVSprintf(buf, "(script '%s')", script);
@ -895,6 +910,8 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, vi
virBufferAdd(buf, "(type ioemu)", 12);
virBufferAdd(buf, ")", 1);
ret = 0;
error:
if (mac != NULL)
xmlFree(mac);
if (source != NULL)
@ -903,7 +920,7 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, vi
xmlFree(script);
if (ip != NULL)
xmlFree(ip);
return (0);
return (ret);
}
/**