[PATCH 2/2] virnetdev: Fix regression in setting VLAN tag

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: 73961771a1cfec3c0f43caec9d117d2fbcc7af39 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2075383 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/util/virnetdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5e60bf068f..93f836cd92 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -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 -- 2.35.1