Work around bug in VS2017 SDV

XENBUS commit 868cd40f (of the same name) introduced a workaround for a
quoting bug in SDV. This commit applies a similar workaround for XENVIF.

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

diff --git a/build.py b/build.py
index fbc92ae9532781f7f626b1652150dab21b144670..4993ce2e968b45ef7690c56be0256682a84bcc26 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -268,7 +268,7 @@ def run_sdv(name, dir, vs):
             '/p:Inputs="/clean"', os.path.join(vs, name))
 
     msbuild(platform, configuration, 'sdv', name + '.vcxproj',
-            '/p:Inputs="/check:default.sdv"', os.path.join(vs, name))
+            '/p:Inputs="/check:default.sdv /debug"', os.path.join(vs, name))
 
     path = [vs, name, 'sdv', 'SDV.DVL.xml']
     remove_timestamps(os.path.join(*path))

diff --git a/src/coinst/coinst.c b/src/coinst/coinst.c
index 36baa241d763a3929ec08fbc6989861d7133a22d..5fbd3eaa49f9dc5b1dd5d622e047d7a535c83d09 100644 (file)
--- a/src/coinst/coinst.c
+++ b/src/coinst/coinst.c
@@ -40,6 +40,10 @@
 #include <version.h>
 #include <revision.h>
 
+#define stringify_literal(_text) #_text
+#define stringify(_text) stringify_literal(_text)
+#define __MODULE__ stringify(PROJECT)
+
 __user_code;
 
 #define MAXIMUM_BUFFER_SIZE 1024

diff --git a/src/xenvif/dbg_print.h b/src/xenvif/dbg_print.h
index a31af9e0423077d0f11a91c3a7a889dd110527b0..b6455269ea4e6fb2cdbad7754a961bac0c0d2385 100644 (file)
--- a/src/xenvif/dbg_print.h
+++ b/src/xenvif/dbg_print.h
@@ -35,9 +35,9 @@
 #include <ntddk.h>
 #include <stdarg.h>
 
-#ifdef  _SDV_
-#define __MODULE__ ""
-#endif
+#define stringify_literal(_text) #_text
+#define stringify(_text) stringify_literal(_text)
+#define __MODULE__ stringify(PROJECT)
 
 #pragma warning(disable:4127)   // conditional expression is constant
 

diff --git a/vs2015/xenvif/xenvif.vcxproj b/vs2015/xenvif/xenvif.vcxproj
index cc39f8d691a474513d28aad47ffbf490a4052db7..3be0c18860d95ee1a7b3629dd8f53bcbb417018b 100644 (file)
--- a/vs2015/xenvif/xenvif.vcxproj
+++ b/vs2015/xenvif/xenvif.vcxproj
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\include\xen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENVIF";POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4711;4548;4820;4668;4255;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/vs2015/xenvif_coinst/xenvif_coinst.vcxproj b/vs2015/xenvif_coinst/xenvif_coinst.vcxproj
index b8f7a98901c31d0f0a16452220b99bcaa16afe70..3d4c39a74708537e710442f598e791f87e94c035 100644 (file)
--- a/vs2015/xenvif_coinst/xenvif_coinst.vcxproj
+++ b/vs2015/xenvif_coinst/xenvif_coinst.vcxproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>__MODULE__="XENVIF_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4127;4548;4711;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/vs2017/xenvif/xenvif.vcxproj b/vs2017/xenvif/xenvif.vcxproj
index fbbcce7a4a1cedf60ff0cfc856c0110ef6a004ce..f2e5d199fe611a3835741e58a6262db7b6d19244 100644 (file)
--- a/vs2017/xenvif/xenvif.vcxproj
+++ b/vs2017/xenvif/xenvif.vcxproj
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\include\xen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENVIF";POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4711;4770;4548;4820;4668;4255;5045;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>

diff --git a/vs2017/xenvif_coinst/xenvif_coinst.vcxproj b/vs2017/xenvif_coinst/xenvif_coinst.vcxproj
index ee691abbd38155285c16eecd27503383150a37f6..4b5faed0c77c39532f9975d7bdb0950be71151ac 100644 (file)
--- a/vs2017/xenvif_coinst/xenvif_coinst.vcxproj
+++ b/vs2017/xenvif_coinst/xenvif_coinst.vcxproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>__MODULE__="XENVIF_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4127;4548;4711;4820;4668;4255;5045;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>