Merge pull request #8 from djs55/add-mirage-types

Implement new mirage-types BLOCK signature
mirage · Nov 21, 2013 · 9389926 · 9389926
2 parents a496e26 + df3223c
commit 9389926
Show file tree

Hide file tree

Showing 9 changed files with 276 additions and 178 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+trunk (unreleased)
+* implement new mirage-types BLOCK interface
+
 0.2.5 (10-Nov-2013)
 * fix build against cstruct.0.8.0
 * blkfront write_page only needs to grant read access to

diff --git a/_oasis b/_oasis
@@ -28,8 +28,8 @@ Library blkfront
   Path:               lib
   Findlibparent:      xenblock
   Findlibname:        front
-  Modules:            Blkfront
-  BuildDepends:       lwt, lwt.syntax, cstruct, cstruct.syntax, mirage, shared-memory-ring, shared-memory-ring.lwt, xenblock
+  Modules:            Blkfront, Blkfront_init
+  BuildDepends:       lwt, lwt.syntax, cstruct, cstruct.syntax, mirage, mirage-types, shared-memory-ring, shared-memory-ring.lwt, xenblock
 
 Library blkback
   Build$:             flag(blkback)

diff --git a/_tags b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 7bd900b7024f84f0fb74d6e39d9969bc)
+# DO NOT EDIT (digest: fa8d6474a1a5bb6911b0fb034ee12cc9)
 # Ignore VCS directories, you can use the same kind of rule outside 
 # OASIS_START/STOP if you want to exclude directories that contains 
 # useless stuff for the build process
@@ -17,6 +17,7 @@
 "lib/xenblock.cmxs": use_xenblock
 # Library blkfront
 "lib/blkfront.cmxs": use_blkfront
+<lib/*.ml{,i}>: pkg_mirage-types
 # Library blkback
 "lib/blkback.cmxs": use_blkback
 <lib/*.ml{,i}>: use_xenblock

diff --git a/lib/META b/lib/META
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 5d19f3e579effe5987b622cdcaef96db)
+# DO NOT EDIT (digest: 29112410a7cdc0a8cf0173c510bb7667)
 version = "0.2.4"
 description = "Xen block frontend and backend driver implementation"
 requires = "cstruct cstruct.syntax"
@@ -12,7 +12,7 @@ package "front" (
  version = "0.2.4"
  description = "Xen block frontend and backend driver implementation"
  requires =
- "lwt lwt.syntax cstruct cstruct.syntax mirage shared-memory-ring shared-memory-ring.lwt xenblock"
+ "lwt lwt.syntax cstruct cstruct.syntax mirage mirage-types shared-memory-ring shared-memory-ring.lwt xenblock"
  archive(byte) = "blkfront.cma"
  archive(byte, plugin) = "blkfront.cma"
  archive(native) = "blkfront.cmxa"