Fix xenstore cleanup

The distribution information is not cleared in the correct place and
cleanup of the hotplug feature flag is missing. This patch fixes both
issues.

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

diff --git a/src/xenvif/fdo.c b/src/xenvif/fdo.c
index 0fc27caa7bc144463c3f001808e8cc756dafbf7f..7d4d015e7a2e88ec79893487d5f7d8d02ceae8c2 100644 (file)
--- a/src/xenvif/fdo.c
+++ b/src/xenvif/fdo.c
@@ -1345,11 +1345,19 @@ __FdoD0ToD3(
 
     ASSERT3U(KeGetCurrentIrql(), ==, DISPATCH_LEVEL);
 
+    (VOID) XENBUS_STORE(Remove,
+                        &Fdo->StoreInterface,
+                        NULL,
+                        "feature/hotplug",
+                        "vif");
+
     (VOID) XENBUS_STORE(WatchRemove,
                         &Fdo->StoreInterface,
                         Fdo->ScanWatch);
     Fdo->ScanWatch = NULL;
 
+    FdoClearDistribution(Fdo);
+
     Trace("<====\n");
 }
 
@@ -1516,8 +1524,6 @@ FdoD0ToD3(
 
     KeLowerIrql(Irql);
 
-    FdoClearDistribution(Fdo);
-
     Trace("<====\n");
 }