[PATCH 20/43] virNodeDevCapsDefParseHexId: Use 'virXPathUIntBase'

Peter Krempa pkrempa at redhat.com
Mon Oct 24 14:14:25 UTC 2022


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 at redhat.com>
---
 src/conf/node_device_conf.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 9d04c5fdf4..ccedf77443 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;
 }

-- 
2.37.3



More information about the libvir-list mailing list