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

virInterfaceDefParseXML: Simplify and cleanup 

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-01-12 13:41:25 +01:00
parent 7443101eb0
commit 56b4186efc
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/conf/interface_conf.c
View File

@ -573,26 +573,14 @@ static virInterfaceDef *
virInterfaceDefParseXML(xmlXPathContextPtr ctxt,
int parentIfType)
{
g_autoptr(virInterfaceDef) def = NULL;
int type;
g_autofree char *tmp = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autoptr(virInterfaceDef) def = NULL;
virInterfaceType type;
xmlNodePtr lnk;
/* check @type */
tmp = virXPathString("string(./@type)", ctxt);
if (tmp == NULL) {
virReportError(VIR_ERR_XML_ERROR,
"%s", _("interface misses the type attribute"));
if (virXMLPropEnum(ctxt->node, "type", virInterfaceTypeFromString,
VIR_XML_PROP_REQUIRED, &type) < 0)
return NULL;
}
type = virInterfaceTypeFromString(tmp);
if (type == -1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown interface type %s"), tmp);
return NULL;
}
def = g_new0(virInterfaceDef, 1);
@ -680,7 +668,8 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt,
return NULL;
break;
}
case VIR_INTERFACE_TYPE_LAST:
return NULL;
}
return g_steal_pointer(&def);