Get rid of InitSafeBootMode veto

This should no longer be necessary since XENVBD gracefully deactivates if
emulated devices are present, which they will be in safe mode.

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

diff --git a/src/xendisk/driver.c b/src/xendisk/driver.c
index fda6b8eba8c4e7ce9cbb684a846a262695ab5ef9..fb0a4b3969c7e81178b9ba5f363ca14f701b4966 100644 (file)
--- a/src/xendisk/driver.c
+++ b/src/xendisk/driver.c
@@ -36,8 +36,6 @@
 #include "assert.h"
 #include <version.h>
 
-extern PULONG       InitSafeBootMode;
-
 typedef struct _XENDISK_DRIVER {
     PDRIVER_OBJECT              DriverObject;
 } XENDISK_DRIVER, *PXENDISK_DRIVER;
@@ -177,9 +175,6 @@ DriverEntry(
 
     DriverObject->DriverUnload = DriverUnload;
 
-    if (*InitSafeBootMode > 0)
-        goto done;
-
     Verbose("XENDISK %d.%d.%d (%d) (%02d.%02d.%04d)\n",
             MAJOR_VERSION,
             MINOR_VERSION,
@@ -197,7 +192,6 @@ DriverEntry(
         DriverObject->MajorFunction[Index] = Dispatch;
     }
 
-done:
     Trace("<====\n");
     return STATUS_SUCCESS;
 }

diff --git a/src/xenvbd/driver.c b/src/xenvbd/driver.c
index 2f13ba658efcc841f66694ca713ee995a37d040a..2fcb2d153c33826158ad1a2d51e9c8b2b68ebda5 100644 (file)
--- a/src/xenvbd/driver.c
+++ b/src/xenvbd/driver.c
@@ -539,7 +539,6 @@ HwStartIo(
 
 //=============================================================================
 // Driver Redirections
-extern PULONG       InitSafeBootMode;
 
 __drv_dispatchType(IRP_MJ_PNP)
 DRIVER_DISPATCH             DispatchPnp;
@@ -663,11 +662,6 @@ DriverEntry(
          MAJOR_VERSION_STR "." MINOR_VERSION_STR "." MICRO_VERSION_STR "." BUILD_NUMBER_STR,
          DAY_STR "/" MONTH_STR "/" YEAR_STR);
 
-    if (*InitSafeBootMode > 0) {
-        Status = STATUS_SUCCESS;
-        goto done;
-    }
-
     InitializeObjectAttributes(&Attributes,
                                RegistryPath,
                                OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,