virInterfaceDefParseXML: Inline trivial virInterfaceDefParseName

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 12:28:49 +01:00
parent 3d54880af1
commit 91624098e0

View File

@ -116,23 +116,6 @@ virInterfaceDefFree(virInterfaceDef *def)
}
static int
virInterfaceDefParseName(virInterfaceDef *def,
xmlXPathContextPtr ctxt)
{
char *tmp;
tmp = virXPathString("string(./@name)", ctxt);
if (tmp == NULL) {
virReportError(VIR_ERR_XML_ERROR,
"%s", _("interface has no name"));
return -1;
}
def->name = tmp;
return 0;
}
static int
virInterfaceDefParseMtu(virInterfaceDef *def,
xmlXPathContextPtr ctxt)
@ -662,8 +645,10 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt,
}
def->type = type;
if (virInterfaceDefParseName(def, ctxt) < 0)
return NULL;
if (!(def->name = virXMLPropString(ctxt->node, "name"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", _("interface has no name"));
return NULL;
}
if (parentIfType == VIR_INTERFACE_TYPE_LAST) {
/* only recognize these in toplevel bond interfaces */