From 160c370db6ad0c6f0ae027c844b2ee035d50891e Mon Sep 17 00:00:00 2001
From: Paul Durrant <paul.durrant@citrix.com>
Date: Wed, 31 May 2017 11:07:18 +0100
Subject: [PATCH] Fix SDV

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---
 src/xenvbd/adapter.c         | 2 +-
 src/xenvbd/frontend.c        | 3 +++
 vs2015/xenvbd/xenvbd.vcxproj | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/xenvbd/adapter.c b/src/xenvbd/adapter.c
index 5d298f3..2e85f9f 100644
--- 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 e40f4d9..79b8f8d 100644
--- 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 4ae5159..f5b9cf7 100644
--- 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>
-- 
2.39.5