tools: libxl: remove libxl_domain_build_state from the IDL

This datastructure is internal to the library.

Remove the reference from libxl_device_console. This could never have
been used from outside libxl and is only used internally to add the
primary PV console to a guest. Make an internal variant of
libxl_device_console_add which takes the build state as a parameter
instead.

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>

3 files changed, 4 insertions, 39 deletions

diff --git a/tools/ocaml/libs/xl/xl.ml b/tools/ocaml/libs/xl/xl.ml
index ff87a58a2d..4bd3f8b20c 100644
--- a/tools/ocaml/libs/xl/xl.ml
+++ b/tools/ocaml/libs/xl/xl.ml
@@ -70,16 +70,6 @@ module Domain_build_info = struct
 	}
 end
 
-module Domain_build_state = struct
-	type t =
-	{
-		store_port : int;
-		store_mfn : int64;
-		console_port : int;
-		console_mfn : int64;
-	}
-end
-
 type domid = int
 
 type disk_phystype =
@@ -139,7 +129,7 @@ module Device_console = struct
 		consoletype : console_type;
 	}
 
-	external add : t -> Domain_build_state.t -> domid -> unit = "stub_xl_device_console_add"
+	external add : 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 09f9b787dd..6dc1df8c20 100644
--- a/tools/ocaml/libs/xl/xl.mli
+++ b/tools/ocaml/libs/xl/xl.mli
@@ -70,16 +70,6 @@ module Domain_build_info : sig
 	}
 end
 
-module Domain_build_state : sig
-	type t =
-	{
-		store_port : int;
-		store_mfn : int64;
-		console_port : int;
-		console_mfn : int64;
-	}
-end
-
 type domid = int
 
 type disk_phystype =
@@ -139,7 +129,7 @@ module Device_console : sig
 		consoletype : console_type;
 	}
 
-	external add : t -> Domain_build_state.t -> domid -> unit = "stub_xl_device_console_add"
+	external add : t -> domid -> unit = "stub_xl_device_console_add"
 end
 
 module Device_vkb : sig
diff --git a/tools/ocaml/libs/xl/xl_stubs.c b/tools/ocaml/libs/xl/xl_stubs.c
index 5758993c95..5488b32012 100644
--- a/tools/ocaml/libs/xl/xl_stubs.c
+++ b/tools/ocaml/libs/xl/xl_stubs.c
@@ -294,18 +294,6 @@ static int sched_credit_val(caml_gc *gc, libxl_sched_credit *c_val, value v)
 	CAMLreturn(0);
 }
 
-static int domain_build_state_val(caml_gc *gc, libxl_domain_build_state *c_val, value v)
-{
-	CAMLparam1(v);
-
-	c_val->store_port = Int_val(Field(v, 0));
-	c_val->store_mfn = Int64_val(Field(v, 1));
-	c_val->console_port = Int_val(Field(v, 2));
-	c_val->console_mfn = Int64_val(Field(v, 3));
-	
-	CAMLreturn(0);
-}
-
 static value Val_sched_credit(libxl_sched_credit *c_val)
 {
 	CAMLparam0();
@@ -436,17 +424,14 @@ value stub_xl_device_nic_del(value info, value domid)
 	CAMLreturn(Val_unit);
 }
 
-value stub_xl_device_console_add(value info, value state, value domid)
+value stub_xl_device_console_add(value info, value domid)
 {
-	CAMLparam3(info, state, domid);
+	CAMLparam2(info, domid);
 	libxl_device_console c_info;
-	libxl_domain_build_state c_state;
 	int ret;
 	INIT_STRUCT();
 
 	device_console_val(&gc, &c_info, info);
-	domain_build_state_val(&gc, &c_state, state);
-	c_info.build_state = &c_state;
 
 	INIT_CTX();
 	ret = libxl_device_console_add(ctx, Int_val(domid), &c_info);