win-pvdrivers

changeset 911:60e760e70c21

Fix for hibernation hang under XP. Not tested under anything else yet.
author James Harper <james.harper@bendigoit.com.au>
date Fri Apr 29 23:56:20 2011 +1000 (2011-04-29)
parents 1ee7940af105
children 1e795031439a
files common/include/xen_windows.h makedist.bat xennet/xennet.c xenvbd/xenvbd_scsiport.c
line diff
     1.1 --- a/common/include/xen_windows.h	Fri Apr 29 23:56:03 2011 +1000
     1.2 +++ b/common/include/xen_windows.h	Fri Apr 29 23:56:20 2011 +1000
     1.3 @@ -3,6 +3,7 @@
     1.4  
     1.5  #include "gplpv_version.h"
     1.6  
     1.7 +#include <ntverp.h>
     1.8  #pragma warning( disable : 4201 ) // nonstandard extension used : nameless struct/union
     1.9  #pragma warning( disable : 4214 ) // nonstandard extension used : bit field types other than int
    1.10  #pragma warning( disable : 4505 ) // 'XenDbgPrint' : unreferenced local function has been removed
     2.1 --- a/makedist.bat	Fri Apr 29 23:56:03 2011 +1000
     2.2 +++ b/makedist.bat	Fri Apr 29 23:56:20 2011 +1000
     2.3 @@ -25,7 +25,7 @@ SET CERT_NAME=GPLPV_Test_Cert
     2.4  REM IF NOT EXIST SIGN_CONFIG.BAT GOTO DONT_SIGN
     2.5  REM CALL SIGN_CONFIG.BAT
     2.6  
     2.7 -IF NOT EXIST gplpv.cer "%DDK_PATH%"\bin\selfsign\makecert -r -pe -ss PrivateCertStore -n "CN=GPLPV_Test_Cert" gplpv.cer
     2.8 +IF NOT EXIST gplpv.cer "%DDK_PATH%"\bin\selfsign\x86\makecert -r -pe -ss PrivateCertStore -n "CN=GPLPV_Test_Cert" gplpv.cer
     2.9  
    2.10  mkdir symbols\%GPLPV_VERSION%
    2.11  
     3.1 --- a/xennet/xennet.c	Fri Apr 29 23:56:03 2011 +1000
     3.2 +++ b/xennet/xennet.c	Fri Apr 29 23:56:20 2011 +1000
     3.3 @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fi
     3.4  /* Not really necessary but keeps PREfast happy */
     3.5  DRIVER_INITIALIZE DriverEntry;
     3.6  static IO_WORKITEM_ROUTINE XenNet_ResumeWorkItem;
     3.7 -#if (NTDDI_VERSION >= NTDDI_WINXP)
     3.8 +#if (VER_PRODUCTBUILD >= 7600)
     3.9  static KDEFERRED_ROUTINE XenNet_SuspendResume;
    3.10  #endif
    3.11  
     4.1 --- a/xenvbd/xenvbd_scsiport.c	Fri Apr 29 23:56:03 2011 +1000
     4.2 +++ b/xenvbd/xenvbd_scsiport.c	Fri Apr 29 23:56:20 2011 +1000
     4.3 @@ -635,6 +635,7 @@ XenVbd_HwScsiFindAdapter(PVOID DeviceExt
     4.4    KdPrint((__DRIVER_NAME "     ConfigInfo->CachesData was initialised to %d\n", ConfigInfo->CachesData));
     4.5    ConfigInfo->CachesData = FALSE;
     4.6    ConfigInfo->BufferAccessScsiPortControlled = FALSE;
     4.7 +#if 0
     4.8    if (ConfigInfo->Dma64BitAddresses == SCSI_DMA64_SYSTEM_SUPPORTED)
     4.9    {
    4.10      ConfigInfo->Master = TRUE;
    4.11 @@ -648,7 +649,7 @@ XenVbd_HwScsiFindAdapter(PVOID DeviceExt
    4.12      ConfigInfo->Dma32BitAddresses = TRUE;
    4.13      KdPrint((__DRIVER_NAME "     Dma64BitAddresses not supported\n"));
    4.14    }
    4.15 -
    4.16 +#endif
    4.17    FUNCTION_EXIT();
    4.18  
    4.19    return SP_RETURN_FOUND;