nodedev: Convert virNodeDeviceObjHasCap to bool

It only returns 0 or 1 anyway, let's be realistic

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-10-09 18:01:57 -04:00
parent 1b4ad370e9
commit d6efd72915

View File

@ -120,7 +120,7 @@ virNodeDeviceObjGetDef(virNodeDeviceObjPtr obj)
} }
static int static bool
virNodeDeviceObjHasCap(const virNodeDeviceObj *obj, virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
const char *cap) const char *cap)
{ {
@ -134,13 +134,13 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
while (caps) { while (caps) {
if (STREQ(cap, virNodeDevCapTypeToString(caps->data.type))) { if (STREQ(cap, virNodeDevCapTypeToString(caps->data.type))) {
return 1; return true;
} else { } else {
switch (caps->data.type) { switch (caps->data.type) {
case VIR_NODE_DEV_CAP_PCI_DEV: case VIR_NODE_DEV_CAP_PCI_DEV:
if ((STREQ(cap, mdev_types)) && if ((STREQ(cap, mdev_types)) &&
(caps->data.pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_MDEV)) (caps->data.pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_MDEV))
return 1; return true;
break; break;
case VIR_NODE_DEV_CAP_SCSI_HOST: case VIR_NODE_DEV_CAP_SCSI_HOST:
@ -148,7 +148,7 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
(caps->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST)) || (caps->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST)) ||
(STREQ(cap, vports_cap) && (STREQ(cap, vports_cap) &&
(caps->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS))) (caps->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS)))
return 1; return true;
break; break;
case VIR_NODE_DEV_CAP_SYSTEM: case VIR_NODE_DEV_CAP_SYSTEM:
@ -172,7 +172,7 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
caps = caps->next; caps = caps->next;
} }
return 0; return false;
} }