tools: ocaml: rename the sched_credit 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>

diff --git a/tools/ocaml/libs/xl/xl.ml b/tools/ocaml/libs/xl/xl.ml
index 3e2244d1d2c484a3df6470e2783f3fd7407a6cdd..3e5b2dee82ede28b80e0f7bc46e60c204f8f0d12 100644 (file)
--- a/tools/ocaml/libs/xl/xl.ml
+++ b/tools/ocaml/libs/xl/xl.ml
@@ -220,11 +220,15 @@ type topology =
 
 type topologyinfo = topology option array
 
-type sched_credit =
-{
-       weight: int;
-       cap: int;
-}
+module Sched_credit = struct
+       type t =
+       {
+               weight: int;
+               cap: int;
+       }
+       external domain_get : domid -> t = "stub_xl_sched_credit_domain_get"
+       external domain_set : domid -> t -> unit = "stub_xl_sched_credit_domain_set"
+end
 
 type button =
        | Button_Power
@@ -234,9 +238,6 @@ external button_press : domid -> button -> unit = "stub_xl_button_press"
 
 external topologyinfo: unit -> topologyinfo = "stub_xl_topologyinfo"
 
-external domain_sched_credit_get : domid -> sched_credit = "stub_xl_sched_credit_domain_get"
-external domain_sched_credit_set : domid -> sched_credit -> unit = "stub_xl_sched_credit_domain_set"
-
 external send_trigger : domid -> string -> int -> unit = "stub_xl_send_trigger"
 external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq"
 external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys"

diff --git a/tools/ocaml/libs/xl/xl.mli b/tools/ocaml/libs/xl/xl.mli
index c1332c9d731a2247e33ffa06fcf9ecf31e4a5575..2e2e177e535315b29e09ea75ce14ce7388fd0c3d 100644 (file)
--- a/tools/ocaml/libs/xl/xl.mli
+++ b/tools/ocaml/libs/xl/xl.mli
@@ -220,11 +220,16 @@ type topology =
 
 type topologyinfo = topology option array
 
-type sched_credit =
-{
-       weight: int;
-       cap: int;
-}
+module Sched_credit : sig
+       type t =
+       {
+               weight: int;
+               cap: int;
+       }
+
+       external domain_get : domid -> t = "stub_xl_sched_credit_domain_get"
+       external domain_set : domid -> t -> unit = "stub_xl_sched_credit_domain_set"
+end
 
 type button =
        | Button_Power
@@ -234,9 +239,6 @@ external button_press : domid -> button -> unit = "stub_xl_button_press"
 
 external topologyinfo: unit -> topologyinfo = "stub_xl_topologyinfo"
 
-external domain_sched_credit_get : domid -> sched_credit = "stub_xl_sched_credit_domain_get"
-external domain_sched_credit_set : domid -> sched_credit -> unit = "stub_xl_sched_credit_domain_set"
-
 external send_trigger : domid -> string -> int -> unit = "stub_xl_send_trigger"
 external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq"
 external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys"