]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: node_device: Convert rest of virXPathUInt XPath expressions to number
authorPeter Krempa <pkrempa@redhat.com>
Wed, 5 Oct 2022 08:40:04 +0000 (10:40 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 2 Nov 2022 08:20:57 +0000 (09:20 +0100)
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 <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/conf/node_device_conf.c

index e775f32c5d39f93ca1f4c708fa9dc5dbadaafc73..1c4f5b7814afd6bd0b0a3308daeae734804eff16 100644 (file)
@@ -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'"),