xenvm: Remove duplicate definition of error combinators

Signed-off-by: Si Beaumont <[email protected]>

Author: simonjbeaumont

xenvm/lvchange.ml

@@ -3,6 +3,7 @@
 open Cmdliner
 open Lwt
 open Xenvm_common
+open Errors
 
 (* lvchange -a[n|y] /dev/VGNAME/LVNAME *)
 

xenvm/pvs.ml

@@ -3,6 +3,7 @@
 open Cmdliner
 open Xenvm_common
 open Lwt
+open Errors
 
 let default_fields = [
  "pv_name";

xenvm/vgs.ml

@@ -3,6 +3,7 @@
 open Cmdliner
 open Lwt
 open Xenvm_common
+open Errors
 open Lvm
 module Vg_IO = Vg.Make(Log)(Block)(Time)(Clock)
 

xenvm/xenvm_common.ml

@@ -470,15 +470,6 @@ let print_table noheadings header rows =
   then List.map print_row rows
   else print_row header :: (List.map print_row rows)
 
-let (>>*=) m f = match m with
-  | `Error (`Msg e) -> fail (Failure e)
-  | `Error (`DuplicateLV x) -> fail (Failure (Printf.sprintf "%s is a duplicate LV name" x))
-  | `Error (`OnlyThisMuchFree (needed, available)) -> fail (Xenvm_interface.Insufficient_free_space(needed, available))
-  | `Error (`UnknownLV x) -> fail (Failure (Printf.sprintf "I couldn't find an LV named %s" x))
-  | `Ok x -> f x
-
-let (>>|=) m f = m >>= fun x -> x >>*= f
-
 let with_block filename f =
   let open Lwt in
   Block.connect filename