[win-pv-devel] [PATCH 2/5] REMOVE_DEVICE must set device to Deleted

[Paul Durrant <pdurrant@xxxxxxxxx>]

From: Owen Smith <owen.smith@xxxxxxxxxx>

Signed-off-by: Owen Smith <owen.smith@xxxxxxxxxx>
---
 src/xenvbd/pdo.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/xenvbd/pdo.c b/src/xenvbd/pdo.c
index 89bfc5a..a77aeed 100644
--- a/src/xenvbd/pdo.c
+++ b/src/xenvbd/pdo.c
@@ -420,10 +420,8 @@ PdoSetDevicePnpState(
             __PnpStateName(Pdo->DevicePnpState),
             __PnpStateName(State));
 
-    if (Pdo->DevicePnpState == Deleted) {
-        ASSERT(State == Deleted);
+    if (Pdo->DevicePnpState == Deleted)
         return;
-    }
 
     Pdo->PrevPnpState = Pdo->DevicePnpState;
     Pdo->DevicePnpState = State;
@@ -2556,15 +2554,11 @@ __PdoRemoveDevice(
         StorPortNotification(BusChangeDetected, PdoGetFdo(Pdo), 0);
         break;
 
-    case Enumerated:
+    default:
         PdoSetMissing(Pdo, "Removed");
         PdoSetDevicePnpState(Pdo, Deleted);
         StorPortNotification(BusChangeDetected, PdoGetFdo(Pdo), 0);
         break;
-
-    default:
-        PdoSetDevicePnpState(Pdo, Enumerated);
-        break;
     }
 }
 
-- 
2.1.1


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
http://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel