From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Wed, 20 Apr 2016 14:05:40 +0000 (+0300)
Subject: vz: trustGuestRxFilters fixes
X-Git-Tag: v2.0.0-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a622f6b32b4d69ada342bee63eb0849fec66ced;p=thirdparty%2Flibvirt.git

vz: trustGuestRxFilters fixes

First we need to always set value to vz sdk parameter so
we can leverage setting code for device updates. This patch
resolves tristate default to off implicitly. This is easier
then extract default value from vz sdk itself. First current
default is off too, second this approach is already taken
for 'net->linkstate'.

Second dump this option in domain xml.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
---

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index e49eb54a41..26aa3f2e22 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -883,7 +883,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt)
     PRL_UINT32 netAdapterIndex;
     PRL_UINT32 emulatedType;
     PRL_RESULT pret;
-    PRL_BOOL isConnected;
+    PRL_BOOL isConnected, isMacFilter;
     int ret = -1;
 
     /* use device name, shown by prlctl as target device
@@ -982,6 +982,12 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt)
     else
         net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN;
 
+    pret = PrlVmDevNet_IsPktFilterPreventMacSpoof(netAdapter, &isMacFilter);
+    prlsdkCheckRetGoto(pret, cleanup);
+
+    net->trustGuestRxFilters = isMacFilter ? VIR_TRISTATE_BOOL_YES :
+                                             VIR_TRISTATE_BOOL_NO;
+
     ret = 0;
  cleanup:
     return ret;
@@ -3171,10 +3177,8 @@ static int prlsdkConfigureNet(vzDriverPtr driver,
         prlsdkCheckRetGoto(pret, cleanup);
     }
 
-    if (net->trustGuestRxFilters == VIR_TRISTATE_BOOL_YES)
-        pret = PrlVmDevNet_SetPktFilterPreventMacSpoof(sdknet, 0);
-    else if (net->trustGuestRxFilters == VIR_TRISTATE_BOOL_NO)
-        pret = PrlVmDevNet_SetPktFilterPreventMacSpoof(sdknet, 1);
+    pret = PrlVmDevNet_SetPktFilterPreventMacSpoof(sdknet,
+                net->trustGuestRxFilters == VIR_TRISTATE_BOOL_YES);
     prlsdkCheckRetGoto(pret, cleanup);
 
     ret = 0;