Merge pull request #280 from robhoes/ca217921

kc284 · web-flow · commit 77858de1fbaf · 2016-08-12T15:11:57.000+01:00
CA-217921: VBD.unplug must destroy the datapath if a VBD was already shut down
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 

Original file line number	Diff line number	Diff line change
`@@ -2085,7 +2085,9 @@ module VBD = struct`
`2085`	`2085`	`)`
`2086`	`2086`	`(fun () ->`
`2087`	`2087`	`match domid, backend with`
`2088`		`- \| Some x, Some (VDI _) -> Storage.dp_destroy task (Storage.id_of (string_of_int x) vbd.Vbd.id)`
	`2088`	`+ \| Some x, None`
	`2089`	`+ \| Some x, Some (VDI _)`
	`2090`	`+ -> Storage.dp_destroy task (Storage.id_of (string_of_int x) vbd.Vbd.id)`
`2089`	`2091`	`\| _ -> ()`
`2090`	`2092`	`)`
`2091`	`2093`	`with`