External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 10:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: node_device: Rename virNodeDevCapsDefParseULong to virNodeDevCapsDefParseUInt

Browse Source 
The function parses an unsigned int so rename it.

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-04 16:39:46 +02:00
parent f7281dd014
commit c0cbdd24d5
1 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/node_device_conf.c
View File

@ -831,7 +831,7 @@ virNodeDevCapsDefParseIntOptional(const char *xpath,
static int static int
virNodeDevCapsDefParseULong(const char *xpath, virNodeDevCapsDefParseUInt(const char *xpath,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
unsigned int *value, unsigned int *value,
virNodeDeviceDef *def, virNodeDeviceDef *def,
@ -1502,25 +1502,25 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt,
ctxt->node = node; ctxt->node = node;
if (virNodeDevCapsDefParseULong("number(./host[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./host[1])", ctxt,
&scsi->host, def, &scsi->host, def,
_("no SCSI host ID supplied for '%s'"), _("no SCSI host ID supplied for '%s'"),
_("invalid SCSI host ID supplied for '%s'")) < 0) _("invalid SCSI host ID supplied for '%s'")) < 0)
return -1; return -1;
if (virNodeDevCapsDefParseULong("number(./bus[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./bus[1])", ctxt,
&scsi->bus, def, &scsi->bus, def,
_("no SCSI bus ID supplied for '%s'"), _("no SCSI bus ID supplied for '%s'"),
_("invalid SCSI bus ID supplied for '%s'")) < 0) _("invalid SCSI bus ID supplied for '%s'")) < 0)
return -1; return -1;
if (virNodeDevCapsDefParseULong("number(./target[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./target[1])", ctxt,
&scsi->target, def, &scsi->target, def,
_("no SCSI target ID supplied for '%s'"), _("no SCSI target ID supplied for '%s'"),
_("invalid SCSI target ID supplied for '%s'")) < 0) _("invalid SCSI target ID supplied for '%s'")) < 0)
return -1; return -1;
if (virNodeDevCapsDefParseULong("number(./lun[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./lun[1])", ctxt,
&scsi->lun, def, &scsi->lun, def,
_("no SCSI LUN ID supplied for '%s'"), _("no SCSI LUN ID supplied for '%s'"),
_("invalid SCSI LUN ID supplied for '%s'")) < 0) _("invalid SCSI LUN ID supplied for '%s'")) < 0)
@ -1615,7 +1615,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt,
ctxt->node = node; ctxt->node = node;
if (create == EXISTING_DEVICE) { if (create == EXISTING_DEVICE) {
if (virNodeDevCapsDefParseULong("number(./host[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./host[1])", ctxt,
&scsi_host->host, def, &scsi_host->host, def,
_("no SCSI host ID supplied for '%s'"), _("no SCSI host ID supplied for '%s'"),
_("invalid SCSI host ID supplied for '%s'")) < 0) { _("invalid SCSI host ID supplied for '%s'")) < 0) {
@ -1775,25 +1775,25 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt,
ctxt->node = node; ctxt->node = node;
if (virNodeDevCapsDefParseULong("number(./number[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./number[1])", ctxt,
&usb_if->number, def, &usb_if->number, def,
_("no USB interface number supplied for '%s'"), _("no USB interface number supplied for '%s'"),
_("invalid USB interface number supplied for '%s'")) < 0) _("invalid USB interface number supplied for '%s'")) < 0)
return -1; return -1;
if (virNodeDevCapsDefParseULong("number(./class[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./class[1])", ctxt,
&usb_if->klass, def, &usb_if->klass, def,
_("no USB interface class supplied for '%s'"), _("no USB interface class supplied for '%s'"),
_("invalid USB interface class supplied for '%s'")) < 0) _("invalid USB interface class supplied for '%s'")) < 0)
return -1; return -1;
if (virNodeDevCapsDefParseULong("number(./subclass[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./subclass[1])", ctxt,
&usb_if->subclass, def, &usb_if->subclass, def,
_("no USB interface subclass supplied for '%s'"), _("no USB interface subclass supplied for '%s'"),
_("invalid USB interface subclass supplied for '%s'")) < 0) _("invalid USB interface subclass supplied for '%s'")) < 0)
return -1; return -1;
if (virNodeDevCapsDefParseULong("number(./protocol[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./protocol[1])", ctxt,
&usb_if->protocol, def, &usb_if->protocol, def,
_("no USB interface protocol supplied for '%s'"), _("no USB interface protocol supplied for '%s'"),
_("invalid USB interface protocol supplied for '%s'")) < 0) _("invalid USB interface protocol supplied for '%s'")) < 0)
@ -1839,13 +1839,13 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt,
ctxt->node = node; ctxt->node = node;
if (virNodeDevCapsDefParseULong("number(./bus[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./bus[1])", ctxt,
&usb_dev->bus, def, &usb_dev->bus, def,
_("no USB bus number supplied for '%s'"), _("no USB bus number supplied for '%s'"),
_("invalid USB bus number supplied for '%s'")) < 0) _("invalid USB bus number supplied for '%s'")) < 0)
return -1; return -1;
if (virNodeDevCapsDefParseULong("number(./device[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./device[1])", ctxt,
&usb_dev->device, def, &usb_dev->device, def,
_("no USB device number supplied for '%s'"), _("no USB device number supplied for '%s'"),
_("invalid USB device number supplied for '%s'")) < 0) _("invalid USB device number supplied for '%s'")) < 0)
@ -2084,25 +2084,25 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt,
pci_dev->klass = -1; pci_dev->klass = -1;
} }
if (virNodeDevCapsDefParseULong("number(./domain[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./domain[1])", ctxt,
&pci_dev->domain, def, &pci_dev->domain, def,
_("no PCI domain ID supplied for '%s'"), _("no PCI domain ID supplied for '%s'"),
_("invalid PCI domain ID supplied for '%s'")) < 0) _("invalid PCI domain ID supplied for '%s'")) < 0)
goto out; goto out;
if (virNodeDevCapsDefParseULong("number(./bus[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./bus[1])", ctxt,
&pci_dev->bus, def, &pci_dev->bus, def,
_("no PCI bus ID supplied for '%s'"), _("no PCI bus ID supplied for '%s'"),
_("invalid PCI bus ID supplied for '%s'")) < 0) _("invalid PCI bus ID supplied for '%s'")) < 0)
goto out; goto out;
if (virNodeDevCapsDefParseULong("number(./slot[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./slot[1])", ctxt,
&pci_dev->slot, def, &pci_dev->slot, def,
_("no PCI slot ID supplied for '%s'"), _("no PCI slot ID supplied for '%s'"),
_("invalid PCI slot ID supplied for '%s'")) < 0) _("invalid PCI slot ID supplied for '%s'")) < 0)
goto out; goto out;
if (virNodeDevCapsDefParseULong("number(./function[1])", ctxt, if (virNodeDevCapsDefParseUInt("number(./function[1])", ctxt,
&pci_dev->function, def, &pci_dev->function, def,
_("no PCI function ID supplied for '%s'"), _("no PCI function ID supplied for '%s'"),
_("invalid PCI function ID supplied for '%s'")) < 0) _("invalid PCI function ID supplied for '%s'")) < 0)