From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 5 Oct 2022 07:24:26 +0000 (+0200)
Subject: virNodeDevCapsDefParseHexId: Use 'virXPathUIntBase'
X-Git-Tag: v8.10.0-rc1~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8989b3a54de997f59281aef90ae4a4660ef0d077;p=thirdparty%2Flibvirt.git

virNodeDevCapsDefParseHexId: Use 'virXPathUIntBase'

Switch to the proper function for parsing integer variant of a hex
number via XPath and spell out properly that the argument is 'unsigned
int'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 1e3565dafc..83e66b85e3 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -1808,15 +1808,14 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt,
 static int
 virNodeDevCapsDefParseHexId(const char *xpath,
                             xmlXPathContextPtr ctxt,
-                            unsigned *value,
+                            unsigned int *value,
                             virNodeDeviceDef *def,
                             const char *missing_error_fmt,
                             const char *invalid_error_fmt)
 {
     int ret;
-    unsigned long val;
 
-    ret = virXPathULongHex(xpath, ctxt, &val);
+    ret = virXPathUIntBase(xpath, ctxt, 16, value);
     if (ret < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        ret == -1 ? missing_error_fmt : invalid_error_fmt,
@@ -1824,7 +1823,6 @@ virNodeDevCapsDefParseHexId(const char *xpath,
         return -1;
     }
 
-    *value = val;
     return 0;
 }