External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 01:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

netdev: Use virNetDevIsVirtualFunction() properly

Browse Source 
virNetDevIsVirtualFunction() returns 1 if the interface is a
virtual function, 0 if it isn't and -1 on error. This means that,
despite the name suggesting otherwise, using it as a predicate is
not correct.

Fix two callers that were doing so adding an explicit check on
the return value.
This commit is contained in:
Andrea Bolognani 2016-02-25 12:03:35 +01:00
parent 04e10925a1
commit dec3a4a135
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/util/virnetdev.c
View File

@ -2531,7 +2531,7 @@ virNetDevReplaceNetConfig(const char *linkdev, int vf,
int ret = -1; int ret = -1;
char *pfdevname = NULL; char *pfdevname = NULL;
if (vf == -1 && virNetDevIsVirtualFunction(linkdev)) { if (vf == -1 && virNetDevIsVirtualFunction(linkdev) == 1) {
/* If this really *is* a VF and the caller just didn't know /* If this really *is* a VF and the caller just didn't know
* it, we should set the MAC address via PF+vf# instead of * it, we should set the MAC address via PF+vf# instead of
* setting directly via VF, because the latter will be * setting directly via VF, because the latter will be
@ -2571,7 +2571,7 @@ virNetDevRestoreNetConfig(const char *linkdev, int vf, const char *stateDir)
char *pfdevname = NULL; char *pfdevname = NULL;
const char *vfdevname = NULL; const char *vfdevname = NULL;
if (vf == -1 && virNetDevIsVirtualFunction(linkdev)) { if (vf == -1 && virNetDevIsVirtualFunction(linkdev) == 1) {
/* If this really *is* a VF and the caller just didn't know /* If this really *is* a VF and the caller just didn't know
* it, we should set the MAC address via PF+vf# instead of * it, we should set the MAC address via PF+vf# instead of
* setting directly via VF, because the latter will be * setting directly via VF, because the latter will be