[win-pv-devel] [PATCH] Further VS2013 SDV fixes

[Paul Durrant <pdurrant@xxxxxxxxx>]

The last set of fixes was not complete. SDV failed again, later on, in
building xenbus.sys.

Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
---
 src/xenbus/bus.c | 4 +++-
 src/xenbus/fdo.c | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/xenbus/bus.c b/src/xenbus/bus.c
index bf0bec7..1cd527f 100644
--- a/src/xenbus/bus.c
+++ b/src/xenbus/bus.c
@@ -122,8 +122,10 @@ BusGetDmaAdapter(
 
     if (Context->InterceptDmaAdapter != 0) {
         RTL_OSVERSIONINFOEXW    VersionInformation;
+        NTSTATUS                status;
 
-        RtlGetVersion((PRTL_OSVERSIONINFOW)&VersionInformation);
+        status = RtlGetVersion((PRTL_OSVERSIONINFOW)&VersionInformation);
+        ASSERT(NT_SUCCESS(status));
 
         if (VersionInformation.dwMajorVersion == 6 &&
             VersionInformation.dwMinorVersion == 0) {
diff --git a/src/xenbus/fdo.c b/src/xenbus/fdo.c
index 76cac4f..17a74ab 100644
--- a/src/xenbus/fdo.c
+++ b/src/xenbus/fdo.c
@@ -1822,6 +1822,7 @@ FdoConnectInterrupt(
     )
 {
     IO_CONNECT_INTERRUPT_PARAMETERS     Connect;
+    BOOLEAN                             Found;
     ULONG                               Cpu;
     NTSTATUS                            status;
 
@@ -1869,12 +1870,13 @@ FdoConnectInterrupt(
     (*Interrupt)->Vector = (UCHAR)Connect.FullySpecified.Vector;
 
 #if defined(__i386__)
-    (VOID)_BitScanReverse(&Cpu, Connect.FullySpecified.ProcessorEnableMask);
+    Found = _BitScanReverse(&Cpu, Connect.FullySpecified.ProcessorEnableMask);
 #elif defined(__x86_64__)
-    (VOID)_BitScanReverse64(&Cpu, Connect.FullySpecified.ProcessorEnableMask);
+    Found = _BitScanReverse64(&Cpu, 
Connect.FullySpecified.ProcessorEnableMask);
 #else
 #error 'Unrecognised architecture'
 #endif
+    ASSERT(Found);
 
     (*Interrupt)->Cpu = Cpu;
 
-- 
2.1.1


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
http://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel