CA-217921: VBD.unplug must destroy the datapath if a VBD was already …

…shut down The comment on top of the `VBD.unplug` function says: 1. if the device has already been shutdown and deactivated (as in suspend) we must call DP.destroy here to avoid leaks However, recent commit d723d4b had regressed this. Signed-off-by: Rob Hoes <[email protected]>
xapi-project · Aug 12, 2016 · 43baf4f · 43baf4f
1 parent 1c7567d
commit 43baf4f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xc/xenops_server_xen.ml b/xc/xenops_server_xen.ml
@@ -2085,7 +2085,9 @@ module VBD = struct
 						)
 						(fun () ->
 							match domid, backend with
-							| Some x, Some (VDI _) -> Storage.dp_destroy task (Storage.id_of (string_of_int x) vbd.Vbd.id)
+							| Some x, None
+							| Some x, Some (VDI _)
+								-> Storage.dp_destroy task (Storage.id_of (string_of_int x) vbd.Vbd.id)
 							| _ -> ()
 						)
 				with