tools: ocaml: rename the build_info 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 957e0a8b7260897c47a3328b3b265062c2959b25..108ec69a39b5b9ade41387c8ee6bbd0e745e9744 100644 (file)
--- a/tools/ocaml/libs/xl/xl.ml
+++ b/tools/ocaml/libs/xl/xl.ml
@@ -31,40 +31,44 @@ module Domain_create_info = struct
        }
 end
 
-type build_pv_info =
-{
-       slack_memkb : int64;
-       cmdline : string;
-       ramdisk : string;
-       features : string;
-}
-
-type build_hvm_info =
-{
-       pae : bool;
-       apic : bool;
-       acpi : bool;
-       nx : bool;
-       viridian : bool;
-       timeoffset : string;
-       timer_mode : int;
-       hpet : int;
-       vpt_align : int;
-}
-
-type build_spec = BuildHVM of build_hvm_info | BuildPV of build_pv_info
+module Domain_build_info = struct
+       module Hvm = struct
+               type t =
+               {
+                       pae : bool;
+                       apic : bool;
+                       acpi : bool;
+                       nx : bool;
+                       viridian : bool;
+                       timeoffset : string;
+                       timer_mode : int;
+                       hpet : int;
+                       vpt_align : int;
+               }
+       end
+
+       module Pv = struct
+               type t =
+               {
+                       slack_memkb : int64;
+                       cmdline : string;
+                       ramdisk : string;
+                       features : string;
+               }
+       end
 
-type build_info =
-{
-       max_vcpus : int;
-       cur_vcpus : int;
-       max_memkb : int64;
-       target_memkb : int64;
-       video_memkb : int64;
-       shadow_memkb : int64;
-       kernel : string;
-       priv: build_spec;
-}
+       type t =
+       {
+               max_vcpus : int;
+               cur_vcpus : int;
+               max_memkb : int64;
+               target_memkb : int64;
+               video_memkb : int64;
+               shadow_memkb : int64;
+               kernel : string;
+               u : [ `HVM of Hvm.t | `PV of Pv.t ];
+       }
+end
 
 type build_state =
 {

diff --git a/tools/ocaml/libs/xl/xl.mli b/tools/ocaml/libs/xl/xl.mli
index 905f149e02caccad2aa33e3d9ab58b93d487b77e..d131c0170ab2340fdbb1cd93c30eba1d30c04092 100644 (file)
--- a/tools/ocaml/libs/xl/xl.mli
+++ b/tools/ocaml/libs/xl/xl.mli
@@ -31,40 +31,44 @@ module Domain_create_info : sig
        }
 end
 
-type build_pv_info =
-{
-       slack_memkb : int64;
-       cmdline : string;
-       ramdisk : string;
-       features : string;
-}
-
-type build_hvm_info =
-{
-       pae : bool;
-       apic : bool;
-       acpi : bool;
-       nx : bool;
-       viridian : bool;
-       timeoffset : string;
-       timer_mode : int;
-       hpet : int;
-       vpt_align : int;
-}
-
-type build_spec = BuildHVM of build_hvm_info | BuildPV of build_pv_info
+module Domain_build_info : sig
+       module Hvm : sig
+               type t =
+               {
+                       pae : bool;
+                       apic : bool;
+                       acpi : bool;
+                       nx : bool;
+                       viridian : bool;
+                       timeoffset : string;
+                       timer_mode : int;
+                       hpet : int;
+                       vpt_align : int;
+               }
+       end
+
+       module Pv : sig
+               type t =
+               {
+                       slack_memkb : int64;
+                       cmdline : string;
+                       ramdisk : string;
+                       features : string;
+               }
+       end
 
-type build_info =
-{
-       max_vcpus : int;
-       cur_vcpus : int;
-       max_memkb : int64;
-       target_memkb : int64;
-       video_memkb : int64;
-       shadow_memkb : int64;
-       kernel : string;
-       priv: build_spec;
-}
+       type t =
+       {
+               max_vcpus : int;
+               cur_vcpus : int;
+               max_memkb : int64;
+               target_memkb : int64;
+               video_memkb : int64;
+               shadow_memkb : int64;
+               kernel : string;
+               u : [ `HVM of Hvm.t | `PV of Pv.t ];
+       }
+end
 
 type build_state =
 {