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

conf: node_device: Refactor 'virNodeDeviceCapVPDParseCustomFields' to fix error reporting

Browse Source 
The errors raised in virNodeDeviceCapVPDParseCustomFields were actually
ignored by continuing the parse rather than raised.

Rather than just replace 'continue' by 'return -1' this patch refactors
the whole parser to simplify it as well as report reasonable errors.

Parsing of individual fields is done without XPath and is extracted into
a common helper.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2024-01-29 18:26:29 +01:00
parent dd328cd48a
commit ea8d864d9e
1 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/conf/node_device_conf.c
View File

@ -953,63 +953,62 @@ virNodeDevCapMdevTypesParseXML(xmlXPathContextPtr ctxt,
return ret; return ret;
} }
static int static int
virNodeDeviceCapVPDParseCustomFields(xmlXPathContextPtr ctxt, virPCIVPDResource *res, bool readOnly) virNodeDeviceCapVPDParseCustomFieldOne(xmlNodePtr node,
virPCIVPDResource *res,
bool read_only,
const char keyword_prefix)
{
g_autofree char *value = NULL;
g_autofree char *index = NULL;
g_autofree char *keyword = NULL;
if (!(index = virXMLPropStringRequired(node, "index")))
return -1;
if (strlen(index) != 1) {
virReportError(VIR_ERR_XML_ERROR,
_("'%1$s' 'index' value '%2$s' malformed"),
node->name, index);
return -1;
}
keyword = g_strdup_printf("%c%c", keyword_prefix, index[0]);
if (!(value = virXMLNodeContentString(node)))
return -1;
virPCIVPDResourceUpdateKeyword(res, read_only, keyword, value);
return 0;
}
static int
virNodeDeviceCapVPDParseCustomFields(xmlXPathContextPtr ctxt,
virPCIVPDResource *res,
bool readOnly)
{ {
int nfields = -1; int nfields = -1;
g_autofree xmlNodePtr *nodes = NULL; g_autofree xmlNodePtr *nodes = NULL;
size_t i = 0; size_t i = 0;
if ((nfields = virXPathNodeSet("./vendor_field[@index]", ctxt, &nodes)) < 0) if ((nfields = virXPathNodeSet("./vendor_field", ctxt, &nodes)) < 0)
return -1; return -1;
for (i = 0; i < nfields; i++) { for (i = 0; i < nfields; i++) {
g_autofree char *value = NULL; if (virNodeDeviceCapVPDParseCustomFieldOne(nodes[i], res, readOnly, 'V') < 0)
g_autofree char *index = NULL; return -1;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *keyword = NULL;
ctxt->node = nodes[i];
if (!(index = virXPathString("string(./@index[1])", ctxt)) ||
strlen(index) > 1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("<vendor_field> evaluation has failed"));
continue;
}
if (!(value = virXPathString("string(./text())", ctxt))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("<vendor_field> value evaluation has failed"));
continue;
}
keyword = g_strdup_printf("V%c", index[0]);
virPCIVPDResourceUpdateKeyword(res, readOnly, keyword, value);
} }
VIR_FREE(nodes); VIR_FREE(nodes);
if (!readOnly) { if (!readOnly) {
if ((nfields = virXPathNodeSet("./system_field[@index]", ctxt, &nodes)) < 0) if ((nfields = virXPathNodeSet("./system_field", ctxt, &nodes)) < 0)
return -1; return -1;
for (i = 0; i < nfields; i++) { for (i = 0; i < nfields; i++) {
g_autofree char *value = NULL; if (virNodeDeviceCapVPDParseCustomFieldOne(nodes[i], res, readOnly, 'Y') < 0)
g_autofree char *index = NULL; return -1;
g_autofree char *keyword = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt);
ctxt->node = nodes[i];
if (!(index = virXPathString("string(./@index[1])", ctxt)) ||
strlen(index) > 1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("<system_field> evaluation has failed"));
continue;
}
if (!(value = virXPathString("string(./text())", ctxt))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("<system_field> value evaluation has failed"));
continue;
}
keyword = g_strdup_printf("Y%c", index[0]);
virPCIVPDResourceUpdateKeyword(res, readOnly, keyword, value);
} }
} }