From: Peter Krempa Date: Wed, 5 Oct 2022 08:40:04 +0000 (+0200) Subject: conf: node_device: Convert rest of virXPathUInt XPath expressions to number X-Git-Tag: v8.10.0-rc1~247 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b016bdd33397856f7069777bfad28d96e7eb73;p=thirdparty%2Flibvirt.git conf: node_device: Convert rest of virXPathUInt XPath expressions to number Convert the rest of the XPath expressions used with virXPathUInt directly to convert via string(). This will become mandatory in upcoming patches. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index e775f32c5d..1c4f5b7814 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -942,7 +942,7 @@ virNodeDevCapMdevTypesParseXML(xmlXPathContextPtr ctxt, goto cleanup; } - if (virXPathUInt("number(./availableInstances)", ctxt, + if (virXPathUInt("string(./availableInstances)", ctxt, &type->available_instances) < 0) { virReportError(VIR_ERR_XML_ERROR, _("missing number of available instances for " @@ -2257,7 +2257,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, /* 'iommuGroup' is optional, only report an error if the supplied value is * invalid (-2), not if it's missing (-1) */ - if (virXPathUInt("number(./iommuGroup[1]/@number)", + if (virXPathUInt("string(./iommuGroup[1]/@number)", ctxt, &mdev->iommuGroupNumber) < -1) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid iommuGroup number attribute for '%s'"),