Fix camldm after renaming of jsonrpc to rpc-light.json. Also add a datatype maybe...

Signed-off-by: Jonathan Ludlam <Jonathan.Ludlam@eu.citrix.com>
Acked-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/camldm/META.in b/camldm/META.in
index 44a406025162ce190c7f9ed9f256284ef514a6c7..9774760d8d1c5cead155d0af50976043e477bac0 100644 (file)
--- a/camldm/META.in
+++ b/camldm/META.in
@@ -1,5 +1,5 @@
 version = "@VERSION@"
 description = "device-mapper ocaml interface"
-requires = "unix,jsonrpc"
+requires = "unix,rpc-light.json"
 archive(byte) = "camldm.cma"
 archive(native) = "camldm.cmxa"

diff --git a/camldm/camldm.mli b/camldm/camldm.mli
index fc57112f1683face8fb1e13fc3c27b303d63cc37..45140f03cfb0166d55618ed620e769f494e756d1 100644 (file)
--- a/camldm/camldm.mli
+++ b/camldm/camldm.mli
@@ -17,6 +17,9 @@ type dev = { device : devty; offset : int64; }
 type stripety = { chunk_size : int64; dests : dev array; }
 type mapty = Linear of dev | Striped of stripety
 type mapping = { start : int64; len : int64; map : mapty; }
+type mapping_array = {
+  m : mapping array 
+} 
 type status = {
   exists : bool;
   suspended : bool;
@@ -33,6 +36,8 @@ type status = {
 exception CreateError of string
 exception ReloadError of string
 
+val rpc_of_mapping_array : mapping_array -> Rpc.t
+val mapping_array_of_rpc : Rpc.t -> mapping_array
 val convert_mapty : mapty -> (string * string) list -> string * string
 val create : string -> mapping array -> (string * string) list -> unit
 val reload : string -> mapping array -> (string * string) list -> unit