External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virnetdev: Fix regression in setting VLAN tag

Browse Source 
In the past, we did set VLAN tag on <interface type='direct'/>.
However, during rewrite (v8.1.0-rc1~191) virNetDevSetVfConfig()
was changed and a condition that was responsible for calling
a function that sets VLAN tag was changed accidentally resulting
in VLAN tag not being set anymore.

However, because of other changes in the same patchset, it may
happen that @adminMac is NULL (this is to work around yet another
broken SRIOV driver), and thus we must refrain from setting MAC
and have to set VLAN tag only.

Fixes: 73961771a1
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2075383
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2022-04-22 14:15:47 +02:00
parent 7899a11523
commit b399f2c000
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/virnetdev.c
View File

@ -1682,7 +1682,8 @@ virNetDevSetVfConfig(const char *ifname,
{
int ret = -1;
if ((ret = virNetDevSetVfMac(ifname, vf, macaddr, allowRetry)) < 0)
if (macaddr &&
(ret = virNetDevSetVfMac(ifname, vf, macaddr, allowRetry)) < 0)
return ret;
if ((ret = virNetDevSetVfVlan(ifname, vf, vlanid)) < 0)
return ret;
@ -2365,7 +2366,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
}
}
if (adminMAC) {
if (adminMAC || vlanTag) {
/* Set vlanTag and admin MAC using an RTM_SETLINK request sent to
* PFdevname+VF#, if mac != NULL this will set the "admin MAC" via
* the PF, *not* the actual VF MAC - the admin MAC only takes