Merge pull request #82 from avsm/TheLortex-api-change

prepare release 1.6.2
mirage · Jun 17, 2019 · 112d5a3 · 112d5a3
2 parents 02e0eb8 + 712363b
commit 112d5a3
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 32 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,6 @@
+## 1.6.2
+* generate exact Merlin files by rearranging build (@avsm)
+
 ## 1.6.1 (2019-04-02):
 * use new grant API from mirage-xen (@yomimono, @talex5)
 * several code cleanups and removals (@yomimono, @emillon)

diff --git a/lib/blkback.ml → lib/back/blkback.ml b/lib/blkback.ml → lib/back/blkback.ml
@@ -43,6 +43,8 @@ end
 
 open Lwt
 open Blkproto
+
+module OS = Os_xen
 module Gntref = OS.Xen.Gntref
 
 type ops = {
@@ -305,7 +307,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/block_request.ml → lib/back/block_request.ml b/lib/block_request.ml → lib/back/block_request.ml
diff --git a/lib/back/dune b/lib/back/dune
@@ -0,0 +1,9 @@
+(library
+ (name mirage_block_xen_back)
+ (public_name mirage-block-xen.back)
+ (modules Blkback Block_request)
+ (flags :standard -w -3)
+ (libraries logs lwt cstruct io-page shared-memory-ring
+   shared-memory-ring-lwt mirage-block-xen xen-evtchn xenstore
+   xenstore.client mirage-block-lwt rresult mirage-xen)
+ (wrapped false))
diff --git a/lib/blkproto.ml → lib/core/blkproto.ml b/lib/blkproto.ml → lib/core/blkproto.ml
@@ -15,6 +15,8 @@
  * 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
@@ -277,9 +279,9 @@ module Req = struct
     val get_hdr_indirect_op: Cstruct.t -> int
     val set_hdr_indirect_op: Cstruct.t -> int -> unit
   end
-  module type PROTOCOL_IMPLEMENTATION = sig 
-    val total_size : int 
-    val segments_per_indirect_page : int 
+  module type PROTOCOL_IMPLEMENTATION = sig
+    val total_size : int
+    val segments_per_indirect_page : int
     val write_segments : seg array -> Cstruct.t -> unit
     val write_request : t -> Cstruct.t -> int64
     val read_request : Cstruct.t -> t

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

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

diff --git a/lib/blkfront.mli → lib/front/blkfront.mli b/lib/blkfront.mli → lib/front/blkfront.mli
diff --git a/lib/block.ml → lib/front/block.ml b/lib/block.ml → lib/front/block.ml
diff --git a/lib/front/dune b/lib/front/dune
@@ -0,0 +1,8 @@
+(library
+ (name mirage_block_xen_front)
+ (public_name mirage-block-xen.front)
+ (modules Blkfront Block)
+ (libraries logs stringext lwt cstruct mirage-block-lwt io-page
+   io-page-xen shared-memory-ring shared-memory-ring-lwt mirage-block-xen
+   xen-evtchn mirage-xen)
+ (wrapped false))
diff --git a/mirage-block-xen.opam b/mirage-block-xen.opam
@@ -43,3 +43,8 @@ library which enables high-throughput, low-latency data
 transfers over shared memory on both x86 and ARM architectures,
 using the standard Xen RPC and event channel semantics.
 """
+
+pin-depends: [
+  ["mirage-xen.dev" "git+https://github.com/mirage/mirage-xen"]
+]
+