Fix SDV

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

diff --git a/src/xenvbd/adapter.c b/src/xenvbd/adapter.c
index 5d298f3bd942d39dff00284d17a43eff1c601273..2e85f9f78ea0ac946eac02b8ea1b1a2a0fca7fdc 100644 (file)
--- a/src/xenvbd/adapter.c
+++ b/src/xenvbd/adapter.c
@@ -1204,7 +1204,7 @@ AdapterInitialize(
 {
     NTSTATUS            status;
 
-    ASSERT3U(KeGetCurrentIrql(), <=, DISPATCH_LEVEL);
+    ASSERT3U(KeGetCurrentIrql(), ==, PASSIVE_LEVEL);
 
     Adapter->DeviceObject           = DeviceObject;
     Adapter->PhysicalDeviceObject   = PhysicalDeviceObject;

diff --git a/src/xenvbd/frontend.c b/src/xenvbd/frontend.c
index e40f4d92c5054151f81f266a0c4932ea3d69de39..79b8f8db363a6b9b307dd14155ad938387668470 100644 (file)
--- a/src/xenvbd/frontend.c
+++ b/src/xenvbd/frontend.c
@@ -538,8 +538,11 @@ __CheckBackendForEject(
     ULONG           Attempt;
     NTSTATUS        Status;
 
+#pragma prefast(suppress:28649)
     if (Frontend->FrontendPath == NULL)
         return;
+
+#pragma prefast(suppress:28649)
     if (Frontend->BackendPath == NULL)
         return;
 

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