NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow empty bridges in interface xml.

Browse Source
This commit is contained in:
Laine Stump 2010-01-01 20:40:24 -05:00 committed by Matthias Bolte
parent d22591efb9
commit 86304e35a3
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/interface_conf.c
View File

@ -557,28 +557,30 @@ virInterfaceDefParseBridge(virConnectPtr conn, virInterfaceDefPtr def,
bridge = ctxt->node; bridge = ctxt->node;
nbItf = virXPathNodeSet(conn, "./interface", ctxt, &interfaces); nbItf = virXPathNodeSet(conn, "./interface", ctxt, &interfaces);
if (nbItf <= 0) { if (nbItf < 0) {
virInterfaceReportError(conn, VIR_ERR_XML_ERROR, virInterfaceReportError(conn, VIR_ERR_XML_ERROR,
"%s", _("bridge has no interfaces")); "%s", _("bridge interfaces"));
ret = -1; ret = -1;
goto error; goto error;
} }
if (VIR_ALLOC_N(def->data.bridge.itf, nbItf) < 0) { if (nbItf > 0) {
virReportOOMError(conn); if (VIR_ALLOC_N(def->data.bridge.itf, nbItf) < 0) {
ret = -1; virReportOOMError(conn);
goto error;
}
def->data.bridge.nbItf = nbItf;
for (i = 0; i < nbItf;i++) {
ctxt->node = interfaces[i];
itf = virInterfaceDefParseBareInterface(conn, ctxt, 0);
if (itf == NULL) {
ret = -1; ret = -1;
def->data.bridge.nbItf = i;
goto error; goto error;
} }
def->data.bridge.itf[i] = itf; def->data.bridge.nbItf = nbItf;
for (i = 0; i < nbItf;i++) {
ctxt->node = interfaces[i];
itf = virInterfaceDefParseBareInterface(conn, ctxt, 0);
if (itf == NULL) {
ret = -1;
def->data.bridge.nbItf = i;
goto error;
}
def->data.bridge.itf[i] = itf;
}
} }
error: error: