tools: ocaml: rename the domain_build_state types and functions

The aims are:
1. make the records instantiable if they have field names in common; and
2. to make it easier to derive the names programatically from the IDL

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
[ijc: s/Device_build_state/Domain_build_state/g]

diff --git a/tools/ocaml/libs/xl/xl.ml b/tools/ocaml/libs/xl/xl.ml
index 108ec69a39b5b9ade41387c8ee6bbd0e745e9744..a2a39e014404383553183f7c68692cbdf202dfe1 100644 (file)
--- a/tools/ocaml/libs/xl/xl.ml
+++ b/tools/ocaml/libs/xl/xl.ml
@@ -70,13 +70,15 @@ module Domain_build_info = struct
        }
 end
 
-type build_state =
-{
-       store_port : int;
-       store_mfn : int64;
-       console_port : int;
-       console_mfn : int64;
-}
+module Domain_build_state = struct
+       type t =
+       {
+               store_port : int;
+               store_mfn : int64;
+               console_port : int;
+               console_mfn : int64;
+       }
+end
 
 type domid = int
 
@@ -137,7 +139,7 @@ module Device_console = struct
                consoletype : console_type;
        }
 
-       external add : t -> build_state -> domid -> unit = "stub_xl_device_console_add"
+       external add : t -> Domain_build_state.t -> domid -> unit = "stub_xl_device_console_add"
 end
 
 module Device_vkb = struct

diff --git a/tools/ocaml/libs/xl/xl.mli b/tools/ocaml/libs/xl/xl.mli
index d131c0170ab2340fdbb1cd93c30eba1d30c04092..d02328940423c419219fc347640ef37d07596700 100644 (file)
--- a/tools/ocaml/libs/xl/xl.mli
+++ b/tools/ocaml/libs/xl/xl.mli
@@ -70,13 +70,15 @@ module Domain_build_info : sig
        }
 end
 
-type build_state =
-{
-       store_port : int;
-       store_mfn : int64;
-       console_port : int;
-       console_mfn : int64;
-}
+module Domain_build_state : sig
+       type t =
+       {
+               store_port : int;
+               store_mfn : int64;
+               console_port : int;
+               console_mfn : int64;
+       }
+end
 
 type domid = int
 
@@ -137,7 +139,7 @@ module Device_console : sig
                consoletype : console_type;
        }
 
-       external add : t -> build_state -> domid -> unit = "stub_xl_device_console_add"
+       external add : t -> Domain_build_state.t -> domid -> unit = "stub_xl_device_console_add"
 end
 
 module Device_vkb : sig