From: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Date: Tue, 10 Jul 2018 13:31:46 +0000 (+0100)
Subject: Disable warning about spectre mitigation
X-Git-Tag: 9.0.0-rc1~11
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=39ea97c13210fcab8bba2afada5f4503b0491a12;p=pvdrivers%2Fwin%2Fxennet.git

Disable warning about spectre mitigation

CL emits a warning about every place that will get spectre mitigation
when compiled with /Qspectre. Even if this option is already used. This
breaks the build, as warnings are treated as errors in xennet.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>

Also disabled the warning in the co-installer build.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---

diff --git a/vs2017/xennet/xennet.vcxproj b/vs2017/xennet/xennet.vcxproj
index 387cdf5..a64d0cb 100644
--- a/vs2017/xennet/xennet.vcxproj
+++ b/vs2017/xennet/xennet.vcxproj
@@ -26,7 +26,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\include\xen;</AdditionalIncludeDirectories>
       <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4464;4711;4770;4548;4820;4668;4255;6001;6054;28160;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4464;4711;4770;4548;4820;4668;4255;5045;6001;6054;28160;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <EnablePREfast>true</EnablePREfast>
     </ClCompile>
diff --git a/vs2017/xennet_coinst/xennet_coinst.vcxproj b/vs2017/xennet_coinst/xennet_coinst.vcxproj
index de61086..4b819b4 100644
--- a/vs2017/xennet_coinst/xennet_coinst.vcxproj
+++ b/vs2017/xennet_coinst/xennet_coinst.vcxproj
@@ -22,7 +22,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__MODULE__="XENNET_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4548;4820;4668;4255;5045;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <EnablePREfast>true</EnablePREfast>
       <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>