Stop asking for a reboot when we install. Any reboot can be deferred to

when the child drivers are installed.

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

diff --git a/src/coinst/coinst.c b/src/coinst/coinst.c
index 370c3f4ded7c5f1cdad6cc7ad79435ba115c3183..1db35bb73220cbe556c8b73cc946da07946d375b 100644 (file)
--- a/src/coinst/coinst.c
+++ b/src/coinst/coinst.c
@@ -1602,37 +1602,6 @@ fail1:
     return FALSE;
 }
 
-static BOOLEAN
-RequestReboot(
-    IN  HDEVINFO            DeviceInfoSet,
-    IN  PSP_DEVINFO_DATA    DeviceInfoData
-    )
-{
-    SP_DEVINSTALL_PARAMS    DeviceInstallParams;
-
-    DeviceInstallParams.cbSize = sizeof (DeviceInstallParams);
-
-    if (!SetupDiGetDeviceInstallParams(DeviceInfoSet,
-                                       DeviceInfoData,
-                                       &DeviceInstallParams))
-        goto fail1;
-
-    DeviceInstallParams.Flags |= DI_NEEDREBOOT;
-
-    Log("Flags = %08x", DeviceInstallParams.Flags);
-
-    if (!SetupDiSetDeviceInstallParams(DeviceInfoSet,
-                                       DeviceInfoData,
-                                       &DeviceInstallParams))
-        goto fail2;
-
-    return TRUE;
-
-fail2:
-fail1:
-    return FALSE;
-}
-
 static FORCEINLINE HRESULT
 __DifInstallPreProcess(
     IN  HDEVINFO                    DeviceInfoSet,
@@ -1754,7 +1723,6 @@ __DifInstallPostProcess(
     if (Count == 1) {
         (VOID) InstallFilter(&GUID_DEVCLASS_SYSTEM, "XENFILT");
         (VOID) InstallFilter(&GUID_DEVCLASS_HDC, "XENFILT");
-        (VOID) RequestReboot(DeviceInfoSet, DeviceInfoData);
     }
 
     if (ActiveDeviceInstance != NULL)
@@ -1938,7 +1906,6 @@ __DifRemovePostProcess(
     if (Count == 0) {
         (VOID) RemoveFilter(&GUID_DEVCLASS_HDC, "XENFILT");
         (VOID) RemoveFilter(&GUID_DEVCLASS_SYSTEM, "XENFILT");
-        (VOID) RequestReboot(DeviceInfoSet, DeviceInfoData);
     }
 
     Log("<====");