mirage-xen 5.0.0 updates

mirage · Nov 1, 2019 · 11479f7 · 11479f7
1 parent 1cf2327
commit 11479f7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/lib/back/blkback.ml b/lib/back/blkback.ml
@@ -44,7 +44,6 @@ end
 open Lwt
 open Blkproto
 
-module OS = Os_xen
 module Gntref = OS.Xen.Gntref
 
 type ops = {
@@ -307,7 +306,7 @@ let init xe domid ring_info ops =
     on_cancel th (fun () ->
       let counter = ref 0 in
       Ring.Rpc.Back.ack_requests ring (fun _ -> incr counter);
-      if !counter <> 0 then Log.err (fun f-> f "FATAL: before unmapping, there were %d outstanding requests on the ring. Events lOSt?" !(counter));
+      if !counter <> 0 then Log.err (fun f-> f "FATAL: before unmapping, there were %d outstanding requests on the ring. Events lost?" !(counter));
       let () = OS.Xen.Import.Local_mapping.unmap_exn mapping in ()
     );
     th, stats

diff --git a/lib/core/blkproto.ml b/lib/core/blkproto.ml
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-module OS = Os_xen
-
 let ( >>= ) x f = match x with
   | Error _ as y -> y
   | Ok x -> f x

diff --git a/lib/core/blkproto.mli b/lib/core/blkproto.mli
@@ -57,7 +57,7 @@ end
 
 module Req : sig
   type seg = {
-    gref : Os_xen.Xen.Gntref.t;
+    gref : OS.Xen.Gntref.t;
     first_sector : int;
     last_sector : int;
   }

diff --git a/lib/core/dune b/lib/core/dune
@@ -2,7 +2,7 @@
  (name mirage_block_xen)
  (public_name mirage-block-xen)
  (modules Blkproto Device_number)
- (libraries cstruct io-page mirage-xen.internals)
+ (libraries cstruct io-page mirage-xen)
  (wrapped false)
  (preprocess
   (pps ppx_cstruct)))
diff --git a/lib/front/blkfront.ml b/lib/front/blkfront.ml
@@ -19,9 +19,7 @@ open Lwt
 open Printf
 open Mirage_block
 open Blkproto
-open Os_xen
-
-module OS = Os_xen
+open OS
 
 let src = Logs.Src.create "blkfront" ~doc:"Mirage Xen blkfront"
 

diff --git a/mirage-block-xen.opam b/mirage-block-xen.opam
@@ -19,7 +19,7 @@ depends: [
   "mirage-block" {>= "2.0.0"}
   "ipaddr"
   "io-page-xen" {>= "2.0.0"}
-  "mirage-xen" {>= "4.0.0"}
+  "mirage-xen" {>= "5.0.0"}
   "rresult"
 ]
 build: [