From 11479f7fbd54654d45212c56454735778bbe2507 Mon Sep 17 00:00:00 2001
From: Hannes Mehnert <hannes@mehnert.org>
Date: Fri, 1 Nov 2019 12:04:24 +0100
Subject: [PATCH] mirage-xen 5.0.0 updates

---
 lib/back/blkback.ml   | 3 +--
 lib/core/blkproto.ml  | 2 --
 lib/core/blkproto.mli | 2 +-
 lib/core/dune         | 2 +-
 lib/front/blkfront.ml | 4 +---
 mirage-block-xen.opam | 2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/back/blkback.ml b/lib/back/blkback.ml
index c666476..df06a3e 100644
--- 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
index 7dd5c89..ccb781a 100644
--- 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
index e2a6fdf..bd823e2 100644
--- 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
index a88ac48..ee6d34e 100644
--- 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
index a1a9718..9009695 100644
--- 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
index 7689b0b..222341a 100644
--- 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: [