External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 21:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

virPCIEDeviceInfoLinkParseXML: Use virXMLProp*

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-05-10 14:48:36 +02:00 committed by Michal Privoznik
parent fee958313d
commit bfba1758a2
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/conf/node_device_conf.c
View File

@ -1601,38 +1601,16 @@ virPCIEDeviceInfoLinkParseXML(xmlXPathContextPtr ctxt,
virPCIELink *lnk) virPCIELink *lnk)
{ {
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
int speed;
g_autofree char *speedStr = NULL;
g_autofree char *portStr = NULL;
ctxt->node = linkNode; if (virXMLPropUInt(linkNode, "width", 0, VIR_XML_PROP_REQUIRED, &lnk->width) < 0)
if (virXPathUInt("number(./@width)", ctxt, &lnk->width) < 0) {
virReportError(VIR_ERR_XML_DETAIL, "%s",
_("mandatory attribute 'width' is missing or malformed"));
return -1; return -1;
}
if ((speedStr = virXPathString("string(./@speed)", ctxt))) { if (virXMLPropEnum(linkNode, "speed", virPCIELinkSpeedTypeFromString,
if ((speed = virPCIELinkSpeedTypeFromString(speedStr)) < 0) { VIR_XML_PROP_NONE, &lnk->speed) < 0)
virReportError(VIR_ERR_XML_DETAIL, return -1;
_("malformed 'speed' attribute: %s"),
speedStr);
return -1;
}
lnk->speed = speed;
}
if ((portStr = virXPathString("string(./@port)", ctxt))) { if (virXMLPropInt(linkNode, "port", 10, VIR_XML_PROP_NONE, &lnk->port, -1) < 0)
if (virStrToLong_i(portStr, NULL, 10, &lnk->port) < 0) { return -1;
virReportError(VIR_ERR_XML_DETAIL,
_("malformed 'port' attribute: %s"),
portStr);
return -1;
}
} else {
lnk->port = -1;
}
return 0; return 0;
} }