External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodeinfo: Check for SYSFS_INFINIBAND_DIR before open

Browse Source 
Commit id 'ac3ed2085' causes 'virsh nodedev-list --cap net' to fail
on any system without SYSFS_INFINIBAND_DIR (/sys/class/infiniband).

Rather than assume it's there and fail on the attempt to open the
non-existent directory, check if it's there - if not, return
success and move on. Also fix caller to check < 0 upon return.

As reported by Suren Hajyan <shajyan@redhat.com> from run of unit tests
This commit is contained in:
John Ferlan 2015-07-23 14:33:32 -04:00
parent c1c5eb6fad
commit 136f17efd1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/virnetdev.c
View File

@ -2976,6 +2976,9 @@ virNetDevRDMAFeature(const char *ifname,
struct dirent *dp; struct dirent *dp;
int ret = -1; int ret = -1;
if (!virFileExists(SYSFS_INFINIBAND_DIR))
return 0;
if (!(dirp = opendir(SYSFS_INFINIBAND_DIR))) { if (!(dirp = opendir(SYSFS_INFINIBAND_DIR))) {
virReportSystemError(errno, virReportSystemError(errno,
_("Failed to opendir path '%s'"), _("Failed to opendir path '%s'"),
@ -3191,7 +3194,7 @@ virNetDevGetFeatures(const char *ifname,
ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_TXUDPTNL)); ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_TXUDPTNL));
# endif # endif
if (virNetDevRDMAFeature(ifname, out)) if (virNetDevRDMAFeature(ifname, out) < 0)
return -1; return -1;
return 0; return 0;
} }