[Xen-devel] [PATCH 10 of 24] tools: ocaml: rename the console types and functions

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1301507668 -3600
# Node ID 06caff5991c65f809ff3013d7d8b1bc2b893b28e
# Parent  7670cfb0da45bdb85bd949bd21eb2004d0989a41
tools: ocaml: rename the console 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@xxxxxxxxxxxxx>
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r 7670cfb0da45 -r 06caff5991c6 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
@@ -123,12 +123,16 @@ type console_type =
        | CONSOLETYPE_XENCONSOLED
        | CONSOLETYPE_IOEMU
 
-type console_info =
-{
-       backend_domid : domid;
-       devid : int;
-       consoletype : console_type;
-}
+module Device_console = struct
+       type t =
+       {
+               backend_domid : domid;
+               devid : int;
+               consoletype : console_type;
+       }
+
+       external add : t -> build_state -> domid -> unit = 
"stub_xl_device_console_add"
+end
 
 type vkb_info =
 {
@@ -196,8 +200,6 @@ type sched_credit =
 external domain_make : create_info -> domid = "stub_xl_domain_make"
 external domain_build : build_info -> domid -> build_state = 
"stub_xl_domain_build"
 
-external console_add : console_info -> build_state -> domid -> unit = 
"stub_xl_console_add"
-
 external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add"
 external vkb_clean_shutdown : domid -> unit = "stub_vkb_clean_shutdown"
 external vkb_hard_shutdown : domid -> unit = "stub_vkb_hard_shutdown"
diff -r 7670cfb0da45 -r 06caff5991c6 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
@@ -123,12 +123,16 @@ type console_type =
        | CONSOLETYPE_XENCONSOLED
        | CONSOLETYPE_IOEMU
 
-type console_info =
-{
-       backend_domid : domid;
-       devid : int;
-       consoletype : console_type;
-}
+module Device_console : sig
+       type t =
+       {
+               backend_domid : domid;
+               devid : int;
+               consoletype : console_type;
+       }
+
+       external add : t -> build_state -> domid -> unit = 
"stub_xl_device_console_add"
+end
 
 type vkb_info =
 {
@@ -196,8 +200,6 @@ type sched_credit =
 external domain_make : create_info -> domid = "stub_xl_domain_make"
 external domain_build : build_info -> domid -> build_state = 
"stub_xl_domain_build"
 
-external console_add : console_info -> build_state -> domid -> unit = 
"stub_xl_console_add"
-
 external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add"
 external vkb_clean_shutdown : domid -> unit = "stub_vkb_clean_shutdown"
 external vkb_hard_shutdown : domid -> unit = "stub_vkb_hard_shutdown"
diff -r 7670cfb0da45 -r 06caff5991c6 tools/ocaml/libs/xl/xl_stubs.c
--- a/tools/ocaml/libs/xl/xl_stubs.c    Wed Mar 30 18:54:28 2011 +0100
+++ b/tools/ocaml/libs/xl/xl_stubs.c    Wed Mar 30 18:54:28 2011 +0100
@@ -436,7 +436,7 @@ value stub_xl_device_nic_del(value info,
        CAMLreturn(Val_unit);
 }
 
-value stub_xl_console_add(value info, value state, value domid)
+value stub_xl_device_console_add(value info, value state, value domid)
 {
        CAMLparam3(info, state, domid);
        libxl_device_console c_info;

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