External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: node_device: Use 'string()' in XPath expressions for virNodeDevCapsDefParseIntOptional

Browse Source 
Upcoming patches will require that the XML XPath query returns a string
for conversion in virXPathInt. Convert all the XPaths used with
virNodeDevCapsDefParseIntOptional which uses virXPathInt internally.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-10-05 10:45:04 +02:00
parent 57b016bdd3
commit 136f351b0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/node_device_conf.c
View File

@ -1623,7 +1623,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt,
} }
/* Optional unique_id value */ /* Optional unique_id value */
scsi_host->unique_id = -1; scsi_host->unique_id = -1;
if (virNodeDevCapsDefParseIntOptional("number(./unique_id[1])", ctxt, if (virNodeDevCapsDefParseIntOptional("string(./unique_id[1])", ctxt,
&scsi_host->unique_id, def, &scsi_host->unique_id, def,
_("invalid unique_id supplied for '%s'")) < 0) { _("invalid unique_id supplied for '%s'")) < 0) {
return -1; return -1;
@ -2140,7 +2140,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt,
/* The default value is -1 since zero is valid NUMA node number */ /* The default value is -1 since zero is valid NUMA node number */
pci_dev->numa_node = -1; pci_dev->numa_node = -1;
if (virNodeDevCapsDefParseIntOptional("number(./numa[1]/@node)", ctxt, if (virNodeDevCapsDefParseIntOptional("string(./numa[1]/@node)", ctxt,
&pci_dev->numa_node, def, &pci_dev->numa_node, def,
_("invalid NUMA node ID supplied for '%s'")) < 0) _("invalid NUMA node ID supplied for '%s'")) < 0)
goto out; goto out;