diff options
author | David Scott <dave.scott@eu.citrix.com> | 2011-03-30 18:54:28 +0100 |
---|---|---|
committer | David Scott <dave.scott@eu.citrix.com> | 2011-03-30 18:54:28 +0100 |
commit | 1a81aedc61b3bb551ab5ee92e0edd90bb3d5dcc0 (patch) | |
tree | 69e560d60168a4057a6360e3d3e9f527f64879a5 /tools/ocaml | |
parent | be7e7eaaa52dc81082f892967d0c95cc960ff27c (diff) | |
download | xen-1a81aedc61b3bb551ab5ee92e0edd90bb3d5dcc0.tar.gz xen-1a81aedc61b3bb551ab5ee92e0edd90bb3d5dcc0.tar.bz2 xen-1a81aedc61b3bb551ab5ee92e0edd90bb3d5dcc0.zip |
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>
Diffstat (limited to 'tools/ocaml')
-rw-r--r-- | tools/ocaml/libs/xl/xl.ml | 70 | ||||
-rw-r--r-- | tools/ocaml/libs/xl/xl.mli | 70 |
2 files changed, 74 insertions, 66 deletions
diff --git a/tools/ocaml/libs/xl/xl.ml b/tools/ocaml/libs/xl/xl.ml index 957e0a8b72..108ec69a39 100644 --- 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 905f149e02..d131c0170a 100644 --- 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 = { |