win-pvdrivers

changeset 412:54cd7acad4f9 0.9.11-pre11

Added some code to try and prevent xenvbd activating when qemu ata is active.
Bumped version number.
author James Harper <james.harper@bendigoit.com.au>
date Tue Aug 12 22:49:42 2008 +1000 (2008-08-12)
parents ee82244eed7c
children dbddf9b4c935
files common.inc installer.nsi xenhide/xenhide.c xenvbd/xenvbd.c
line diff
     1.1 --- a/common.inc	Tue Aug 12 15:08:19 2008 +1000
     1.2 +++ b/common.inc	Tue Aug 12 22:49:42 2008 +1000
     1.3 @@ -1,4 +1,4 @@
     1.4 -VERSION=0.9.10.11
     1.5 +VERSION=0.9.10.12
     1.6  TARGETPATH=..\Target\$(DDK_TARGET_OS)
     1.7  MSC_WARNING_LEVEL=/W4
     1.8  INCLUDES = ..\common\include;..\common\include\public
     2.1 --- a/installer.nsi	Tue Aug 12 15:08:19 2008 +1000
     2.2 +++ b/installer.nsi	Tue Aug 12 22:49:42 2008 +1000
     2.3 @@ -3,7 +3,7 @@
     2.4  
     2.5  !define AppName "Xen PV Drivers"
     2.6  !define StartMenu "$SMPROGRAMS\${AppName}"
     2.7 -!define Version "0.9.11-pre10"
     2.8 +!define Version "0.9.11-pre11"
     2.9  #!define Version "$%VERSION%"
    2.10  Name "${AppName}"
    2.11  InstallDir "$PROGRAMFILES\${AppName}"
     3.1 --- a/xenhide/xenhide.c	Tue Aug 12 15:08:19 2008 +1000
     3.2 +++ b/xenhide/xenhide.c	Tue Aug 12 22:49:42 2008 +1000
     3.3 @@ -38,6 +38,7 @@ XenHide_AddDevice();
     3.4  #endif
     3.5  
     3.6  static BOOLEAN gplpv;
     3.7 +static BOOLEAN at_boot;
     3.8  static BOOLEAN qemu_ide_device_filter_installed;
     3.9  static BOOLEAN qemu_scsi_device_filter_installed;
    3.10  static KEVENT add_device_event;
     4.1 --- a/xenvbd/xenvbd.c	Tue Aug 12 15:08:19 2008 +1000
     4.2 +++ b/xenvbd/xenvbd.c	Tue Aug 12 22:49:42 2008 +1000
     4.3 @@ -40,10 +40,20 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
     4.4  {
     4.5    ULONG status;
     4.6    HW_INITIALIZATION_DATA HwInitializationData;
     4.7 +  PCONFIGURATION_INFORMATION conf_info;
     4.8  
     4.9    KdPrint((__DRIVER_NAME " --> "__FUNCTION__ "\n"));
    4.10    KdPrint((__DRIVER_NAME "     IRQL = %d\n", KeGetCurrentIrql()));
    4.11  
    4.12 +  conf_info = IoGetConfigurationInformation();
    4.13 +  KdPrint((__DRIVER_NAME "     conf_info->DiskCount = %d\n", conf_info->DiskCount));
    4.14 +  if (conf_info->DiskCount)
    4.15 +  {
    4.16 +    KdPrint((__DRIVER_NAME "     Not loaded at boot time so not loading\n"));
    4.17 +    KdPrint((__DRIVER_NAME " <-- " __FUNCTION__ "\n"));
    4.18 +    return STATUS_UNSUCCESSFUL;
    4.19 +  }
    4.20 +  
    4.21    RtlZeroMemory(&HwInitializationData, sizeof(HW_INITIALIZATION_DATA));
    4.22  
    4.23    HwInitializationData.HwInitializationDataSize = sizeof(HW_INITIALIZATION_DATA);