Mailing List Archive

# HG changeset patch
# User David Scott <dave.scott@eu.citrix.com>
# Date 1301507668 -3600
# Node ID 9179b9a3b07b6222098137af572641dc48efbb85
# Parent b11a5837b9a0df49095301288776b018219c2fc6
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>

diff -r b11a5837b9a0 -r 9179b9a3b07b tools/ocaml/libs/xl/xl.ml
--- a/tools/ocaml/libs/xl/xl.ml Wed Mar 30 18:54:28 2011 +0100
+++ b/tools/ocaml/libs/xl/xl.ml Wed Mar 30 18:54:28 2011 +0100
@@ -31,40 +31,44 @@ module Domain_create_info = struct
}
end

-type build_pv_info =
-{
- slack_memkb : int64;
- cmdline : string;
- ramdisk : string;
- features : string;
-}
+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

-type build_hvm_info =
-{
- pae : bool;
- apic : bool;
- acpi : bool;
- nx : bool;
- viridian : bool;
- timeoffset : string;
- timer_mode : int;
- hpet : int;
- vpt_align : int;
-}
+ module Pv = struct
+ type t =
+ {
+ slack_memkb : int64;
+ cmdline : string;
+ ramdisk : string;
+ features : string;
+ }
+ end

-type build_spec = BuildHVM of build_hvm_info | BuildPV of build_pv_info
-
-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 -r b11a5837b9a0 -r 9179b9a3b07b tools/ocaml/libs/xl/xl.mli
--- a/tools/ocaml/libs/xl/xl.mli Wed Mar 30 18:54:28 2011 +0100
+++ b/tools/ocaml/libs/xl/xl.mli Wed Mar 30 18:54:28 2011 +0100
@@ -31,40 +31,44 @@ module Domain_create_info : sig
}
end

-type build_pv_info =
-{
- slack_memkb : int64;
- cmdline : string;
- ramdisk : string;
- features : string;
-}
+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

-type build_hvm_info =
-{
- pae : bool;
- apic : bool;
- acpi : bool;
- nx : bool;
- viridian : bool;
- timeoffset : string;
- timer_mode : int;
- hpet : int;
- vpt_align : int;
-}
+ module Pv : sig
+ type t =
+ {
+ slack_memkb : int64;
+ cmdline : string;
+ ramdisk : string;
+ features : string;
+ }
+ end

-type build_spec = BuildHVM of build_hvm_info | BuildPV of build_pv_info
-
-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 =
{

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel