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

Make monitor type (miimon/arpmon) optional in bond xml

Browse Source 
* src/conf/interface_conf.c: lack of one of these in the live xml output
  was causing the parse in virInterfaceDefParseBond() to fail
This commit is contained in:
Laine Stump
2009-11-03 20:15:38 +01:00
committed by Daniel Veillard
parent 23eaae9aff
commit 468439854b
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/conf/interface_conf.c
View File

@@ -629,13 +629,17 @@ static int
virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def,
xmlXPathContextPtr ctxt) { xmlXPathContextPtr ctxt) {
xmlNodePtr node; xmlNodePtr node;
int ret = 0; int ret = -1;
unsigned long tmp; unsigned long tmp;
def->data.bond.mode = virInterfaceDefParseBondMode(conn, ctxt); def->data.bond.mode = virInterfaceDefParseBondMode(conn, ctxt);
if (def->data.bond.mode < 0) if (def->data.bond.mode < 0)
goto error; goto error;
ret = virInterfaceDefParseBondItfs(conn, def, ctxt);
if (ret != 0)
goto error;
node = virXPathNode(conn, "./miimon[1]", ctxt); node = virXPathNode(conn, "./miimon[1]", ctxt);
if (node != NULL) { if (node != NULL) {
def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_MII; def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_MII;
@@ -667,15 +671,13 @@ virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def,
} }
def->data.bond.carrier = virInterfaceDefParseBondMiiCarrier(conn, ctxt); def->data.bond.carrier = virInterfaceDefParseBondMiiCarrier(conn, ctxt);
if (def->data.bond.carrier < 0) if (def->data.bond.carrier < 0) {
ret = -1;
goto error; goto error;
ret = virInterfaceDefParseBondItfs(conn, def, ctxt);
goto done;
} }
node = virXPathNode(conn, "./arpmon[1]", ctxt);
if (node != NULL) { } else if ((node = virXPathNode(conn, "./arpmon[1]", ctxt)) != NULL) {
def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_ARP; def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_ARP;
ret = virXPathULong(conn, "string(./arpmon/@interval)", ctxt, &tmp); ret = virXPathULong(conn, "string(./arpmon/@interval)", ctxt, &tmp);
@@ -691,23 +693,17 @@ virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def,
if (def->data.bond.target == NULL) { if (def->data.bond.target == NULL) {
virInterfaceReportError(conn, VIR_ERR_XML_ERROR, virInterfaceReportError(conn, VIR_ERR_XML_ERROR,
"%s", _("bond interface arpmon target missing")); "%s", _("bond interface arpmon target missing"));
ret = -1;
goto error; goto error;
} }
def->data.bond.validate = virInterfaceDefParseBondArpValid(conn, ctxt); def->data.bond.validate = virInterfaceDefParseBondArpValid(conn, ctxt);
if (def->data.bond.validate < 0) if (def->data.bond.validate < 0) {
goto error;
ret = virInterfaceDefParseBondItfs(conn, def, ctxt);
goto done;
}
virInterfaceReportError(conn, VIR_ERR_XML_ERROR,
"%s", _("bond interface need miimon or arpmon element"));
error:
ret = -1; ret = -1;
done: goto error;
}
}
error:
return(ret); return(ret);
} }
@@ -1107,11 +1103,6 @@ virInterfaceBondDefFormat(virConnectPtr conn, virBufferPtr buf,
else if (def->data.bond.validate == VIR_INTERFACE_BOND_ARP_ALL) else if (def->data.bond.validate == VIR_INTERFACE_BOND_ARP_ALL)
virBufferAddLit(buf, " validate='all'"); virBufferAddLit(buf, " validate='all'");
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} else {
virInterfaceReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("bond monitoring type %d unknown"),
def->data.bond.monit);
return(-1);
} }
for (i = 0;i < def->data.bond.nbItf;i++) { for (i = 0;i < def->data.bond.nbItf;i++) {
if (virInterfaceBareDevDefFormat(conn, buf, def->data.bond.itf[i]) < 0) if (virInterfaceBareDevDefFormat(conn, buf, def->data.bond.itf[i]) < 0)