]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Node Devices: Fix nodedev-list for fc_host & vports.
authorPrerna Saxena <prerna@linux.vnet.ibm.com>
Wed, 6 Aug 2014 10:20:11 +0000 (15:50 +0530)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 6 Aug 2014 11:45:45 +0000 (07:45 -0400)
In a system with Fiber Channel Host Adapters, a query to list all Fibre Channel
HBAs OR Vports currently returns empty list:
  $ virsh nodedev-list --cap fc_host

  $

Libvirt correctly discovers properties for all HBAs. However, the reporting
fails because of incorrect flag comparison while filtering these types.

This is fixed by removing references to 'VIR_CONNECT_LIST_NODE_DEVICES_CAP_*'
for comparison and replacing those with 'VIR_NODE_DEV_CAP_*'

Introduced by original commit id '652a2ec6'

Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
src/conf/node_device_conf.c

index 96524a627892c1ed604c16f0b169da18371598b9..025d08c8f6d2aa61720b20634348088b83e417e9 100644 (file)
@@ -1732,12 +1732,12 @@ virNodeDeviceCapMatch(virNodeDeviceObjPtr devobj,
             return true;
 
         if (cap->type == VIR_NODE_DEV_CAP_SCSI_HOST) {
-            if (type == VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST &&
+            if (type == VIR_NODE_DEV_CAP_FC_HOST &&
                 (cap->data.scsi_host.flags &
                  VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST))
                 return true;
 
-            if (type == VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPORTS &&
+            if (type == VIR_NODE_DEV_CAP_VPORTS &&
                 (cap->data.scsi_host.flags &
                  VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS))
                 return true;