win-pvdrivers

changeset 758:6bed92b175e6

Fix a bug preventing save/migrate when a cdrom device is used
author James Harper <james.harper@bendigoit.com.au>
date Tue Jan 12 23:15:40 2010 +1100 (2010-01-12)
parents dd1a5155540b
children 996f1c7d2cb3
files xenvbd/xenvbd.c
line diff
     1.1 --- a/xenvbd/xenvbd.c	Tue Jan 12 11:32:33 2010 +1100
     1.2 +++ b/xenvbd/xenvbd.c	Tue Jan 12 23:15:40 2010 +1100
     1.3 @@ -882,9 +882,9 @@ XenVbd_HwScsiInterrupt(PVOID DeviceExten
     1.4  
     1.5    if (suspend_resume_state_pdo == SR_STATE_SUSPENDING)
     1.6    {
     1.7 -    if (xvdd->shadow_free == SHADOW_ENTRIES)
     1.8 +    if (xvdd->inactive || xvdd->shadow_free == SHADOW_ENTRIES)
     1.9      {
    1.10 -      /* all entries are purged from the list. ready to suspend */
    1.11 +      /* all entries are purged from the list (or we are inactive). ready to suspend */
    1.12        xvdd->device_state->suspend_resume_state_fdo = suspend_resume_state_pdo;
    1.13        KeMemoryBarrier();
    1.14        KdPrint((__DRIVER_NAME "     Set fdo state SR_STATE_SUSPENDING\n"));
    1.15 @@ -925,10 +925,10 @@ XenVbd_HwScsiStartIo(PVOID DeviceExtensi
    1.16  
    1.17    if (xvdd->device_state->suspend_resume_state_pdo != SR_STATE_RUNNING)
    1.18    {
    1.19 -    KdPrint((__DRIVER_NAME " --> HwScsiStartIo (Resuming)\n"));
    1.20 +    KdPrint((__DRIVER_NAME " --> HwScsiStartIo (Suspending/Resuming)\n"));
    1.21      Srb->SrbStatus = SRB_STATUS_BUSY;
    1.22      ScsiPortNotification(RequestComplete, DeviceExtension, Srb);
    1.23 -    KdPrint((__DRIVER_NAME " <-- HwScsiStartIo (Resuming)\n"));
    1.24 +    KdPrint((__DRIVER_NAME " <-- HwScsiStartIo (Suspending/Resuming)\n"));
    1.25      return TRUE;
    1.26    }
    1.27