From: Paul Durrant Date: Thu, 19 Jul 2018 10:18:56 +0000 (+0100) Subject: Work around bug in VS2017 SDV X-Git-Tag: 9.0.0-rc1~13 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=edbdfde0b56a7d73178edc048de3eac341aaeab6;p=pvdrivers%2Fwin%2Fxencons.git 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 XENCONS. Signed-off-by: Paul Durrant --- diff --git a/build.py b/build.py index 5e0d03b..2f29f60 100644 --- 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 1a2343b..4d2953d 100644 --- a/src/coinst/coinst.c +++ b/src/coinst/coinst.c @@ -39,6 +39,10 @@ #include +#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/monitor/monitor.c b/src/monitor/monitor.c index 34947c6..1912047 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -47,6 +47,10 @@ #include "messages.h" +#define stringify_literal(_text) #_text +#define stringify(_text) stringify_literal(_text) +#define __MODULE__ stringify(PROJECT) + #define MONITOR_NAME __MODULE__ #define MONITOR_DISPLAYNAME MONITOR_NAME diff --git a/src/xencons/dbg_print.h b/src/xencons/dbg_print.h index 5eedd51..61fb7e6 100644 --- a/src/xencons/dbg_print.h +++ b/src/xencons/dbg_print.h @@ -35,9 +35,9 @@ #include #include -#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/xencons/xencons.vcxproj b/vs2015/xencons/xencons.vcxproj index 435ef21..a730afc 100644 --- a/vs2015/xencons/xencons.vcxproj +++ b/vs2015/xencons/xencons.vcxproj @@ -21,7 +21,7 @@ $(WindowsSdkDir)\include\km;..\..\include;..\..\include\xen;%(AdditionalIncludeDirectories) - __MODULE__="XENCONS";POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions) + PROJECT=$(ProjectName);POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions) EnableAllWarnings 4464;4711;4548;4820;4668;4255;6001;6054;28196;30030;30029;%(DisableSpecificWarnings) true diff --git a/vs2015/xencons_coinst/xencons_coinst.vcxproj b/vs2015/xencons_coinst/xencons_coinst.vcxproj index 9579573..adf4ddd 100644 --- a/vs2015/xencons_coinst/xencons_coinst.vcxproj +++ b/vs2015/xencons_coinst/xencons_coinst.vcxproj @@ -22,7 +22,7 @@ - __MODULE__="XENCONS_COINST";%(PreprocessorDefinitions) + PROJECT=$(ProjectName);%(PreprocessorDefinitions) EnableAllWarnings 4127;4548;4711;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings) true diff --git a/vs2015/xencons_monitor/xencons_monitor.vcxproj b/vs2015/xencons_monitor/xencons_monitor.vcxproj index 05b5e45..7b6fe20 100644 --- a/vs2015/xencons_monitor/xencons_monitor.vcxproj +++ b/vs2015/xencons_monitor/xencons_monitor.vcxproj @@ -23,7 +23,7 @@ $(SolutionDir)..\include;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;__MODULE__="XENCONS_MONITOR";%(PreprocessorDefinitions) + PROJECT=$(ProjectName);WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableAllWarnings 4127;4711;4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings) true diff --git a/vs2017/xencons/xencons.vcxproj b/vs2017/xencons/xencons.vcxproj index 9346e7e..b9292e9 100644 --- a/vs2017/xencons/xencons.vcxproj +++ b/vs2017/xencons/xencons.vcxproj @@ -21,7 +21,7 @@ $(WindowsSdkDir)\include\km;..\..\include;..\..\include\xen;%(AdditionalIncludeDirectories) - __MODULE__="XENCONS";POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions) + PROJECT=$(ProjectName);POOL_NX_OPTIN=1;NT_PROCESSOR_GROUPS;%(PreprocessorDefinitions) true EnableAllWarnings 4464;4711;4770;4548;4820;4668;4255;5045;6001;6054;28196;30030;30029;%(DisableSpecificWarnings) diff --git a/vs2017/xencons_coinst/xencons_coinst.vcxproj b/vs2017/xencons_coinst/xencons_coinst.vcxproj index 942b2d4..006ef20 100644 --- a/vs2017/xencons_coinst/xencons_coinst.vcxproj +++ b/vs2017/xencons_coinst/xencons_coinst.vcxproj @@ -22,7 +22,7 @@ - __MODULE__="XENCONS_COINST";%(PreprocessorDefinitions) + PROJECT=$(ProjectName);%(PreprocessorDefinitions) EnableAllWarnings 4127;4548;4711;4820;4668;4255;5045;6001;6054;28196;%(DisableSpecificWarnings) true diff --git a/vs2017/xencons_monitor/xencons_monitor.vcxproj b/vs2017/xencons_monitor/xencons_monitor.vcxproj index 8fdff82..02dc7fd 100644 --- a/vs2017/xencons_monitor/xencons_monitor.vcxproj +++ b/vs2017/xencons_monitor/xencons_monitor.vcxproj @@ -23,7 +23,7 @@ $(SolutionDir)..\include;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;__MODULE__="XENCONS_MONITOR";%(PreprocessorDefinitions) + PROJECT=$(ProjectName);WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableAllWarnings 4127;4711;4548;4820;4668;4255;5045;6001;6054;28196;%(DisableSpecificWarnings) true