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 XENVBD.

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

diff --git a/build.py b/build.py
index dba98131fba99d5495a1db46e3ef4a360a890b91..5e3fbe4f545e70290e6dde968ff3c0f2baea4ead 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 870de27727ef82f2a88c89fc1ea08b0f271812f0..bc8f60599ccc9bd95f10649af651f251a924a65e 100644 (file)
--- a/src/coinst/coinst.c
+++ b/src/coinst/coinst.c
@@ -37,6 +37,10 @@
 
 #include <version.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/xendisk/debug.h b/src/xendisk/debug.h
index 787ca8f86641df57d7ec38a7ccf89c18194e5f08..fd3cdcca41a1521a4c0fab4cb34babefa5a44062 100644 (file)
--- a/src/xendisk/debug.h
+++ b/src/xendisk/debug.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)
 
 // DEBUG_FILTER_MASKs
 // Set these to see relevant output

diff --git a/src/xenvbd/debug.h b/src/xenvbd/debug.h
index f592f864232239fb983957a83c4c042887a81a8d..f119b677f0eb6ff30685e8bc4bf9653f6f3a66da 100644 (file)
--- a/src/xenvbd/debug.h
+++ b/src/xenvbd/debug.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)
 
 // DEBUG_FILTER_MASKs
 // Set these to see relevant output

diff --git a/vs2015/xencrsh/xencrsh.vcxproj b/vs2015/xencrsh/xencrsh.vcxproj
index 986614e51cd72d0be95fcde626cdcf10dac3072e..d9231408301ec5cb92bd13fcffb3dd08dbefd43f 100644 (file)
--- a/vs2015/xencrsh/xencrsh.vcxproj
+++ b/vs2015/xencrsh/xencrsh.vcxproj
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENCRSH";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4548;4711;4820;4668;4255;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/vs2015/xendisk/xendisk.vcxproj b/vs2015/xendisk/xendisk.vcxproj
index 291ec915f927804bd22042b3cfdef56f3f79595f..a8c9bfb5d01de48f92500f9ce96c6d7a0c2f8f95 100644 (file)
--- a/vs2015/xendisk/xendisk.vcxproj
+++ b/vs2015/xendisk/xendisk.vcxproj
@@ -22,7 +22,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>__MODULE__="XENDISK";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4548;4711;4820;4668;4255;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/vs2015/xenvbd/xenvbd.vcxproj b/vs2015/xenvbd/xenvbd.vcxproj
index 752a021cf8efb30e2e061f269c3602ccd7f469b5..db24124605d52ed72e4434ec3b2c2c67f8e2e420 100644 (file)
--- a/vs2015/xenvbd/xenvbd.vcxproj
+++ b/vs2015/xenvbd/xenvbd.vcxproj
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENVBD";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4548;4711;4820;4668;4255;6001;6054;28160;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/vs2015/xenvbd_coinst/xenvbd_coinst.vcxproj b/vs2015/xenvbd_coinst/xenvbd_coinst.vcxproj
index 69bb075f2ca853b14ee8c382fa2b4ab4972f0334..01a55733989578163b32bcdad250b5db0c3f4d7f 100644 (file)
--- a/vs2015/xenvbd_coinst/xenvbd_coinst.vcxproj
+++ b/vs2015/xenvbd_coinst/xenvbd_coinst.vcxproj
@@ -19,7 +19,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENVBD_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/xencrsh/xencrsh.vcxproj b/vs2017/xencrsh/xencrsh.vcxproj
index 3c89492f2b628f6b52069bda4ef1ae725a999d58..22b857ce5d73a0fbd70b6945325b5e88ba49d139 100644 (file)
--- a/vs2017/xencrsh/xencrsh.vcxproj
+++ b/vs2017/xencrsh/xencrsh.vcxproj
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENCRSH";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4548;4770;4711;4820;4668;4255;5045;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>

diff --git a/vs2017/xendisk/xendisk.vcxproj b/vs2017/xendisk/xendisk.vcxproj
index 9baadfc36d7aabfad4b8ab965b5d6bdc33fa173e..db1020f9d20afe487e5fd6d3bda71735addb748c 100644 (file)
--- a/vs2017/xendisk/xendisk.vcxproj
+++ b/vs2017/xendisk/xendisk.vcxproj
@@ -22,7 +22,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>__MODULE__="XENDISK";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PROJECT=$(ProjectName);POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <DisableSpecificWarnings>4464;4548;4770;4711;4820;4668;4255;5045;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>

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

diff --git a/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj b/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj
index 3b56283c6c6799f44c307c9abd542f3f82605b04..fa5fdb3807145ff81cd2557d619dc03773d760ec 100644 (file)
--- a/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj
+++ b/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj
@@ -19,7 +19,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__MODULE__="XENVBD_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>