# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1301507668 -3600
# Node ID 10db4482d72ad85ee2d92713435621ba6e1a8f0b
# Parent 06caff5991c65f809ff3013d7d8b1bc2b893b28e
tools: ocaml: rename the vkb 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 06caff5991c6 -r 10db4482d72a 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
@@ -134,27 +134,39 @@ module Device_console = struct
external add : t -> build_state -> domid -> unit =
"stub_xl_device_console_add"
end
-type vkb_info =
-{
- backend_domid : domid;
- devid : int;
-}
+module Device_vkb = struct
+ type t =
+ {
+ backend_domid : domid;
+ devid : int;
+ }
+
+ external add : t -> domid -> unit = "stub_xl_device_vkb_add"
+ external clean_shutdown : domid -> unit =
"stub_xl_device_vkb_clean_shutdown"
+ external hard_shutdown : domid -> unit =
"stub_xl_device_vkb_hard_shutdown"
+end
-type vfb_info =
-{
- backend_domid : domid;
- devid : int;
- vnc : bool;
- vnclisten : string;
- vncpasswd : string;
- vncdisplay : int;
- vncunused : bool;
- keymap : string;
- sdl : bool;
- opengl : bool;
- display : string;
- xauthority : string;
-}
+module Device_vfb = struct
+ type t =
+ {
+ backend_domid : domid;
+ devid : int;
+ vnc : bool;
+ vnclisten : string;
+ vncpasswd : string;
+ vncdisplay : int;
+ vncunused : bool;
+ keymap : string;
+ sdl : bool;
+ opengl : bool;
+ display : string;
+ xauthority : string;
+ }
+ external add : t -> domid -> unit = "stub_xl_device_vfb_add"
+ external clean_shutdown : domid -> unit =
"stub_xl_device_vfb_clean_shutdown"
+ external hard_shutdown : domid -> unit =
"stub_xl_device_vfb_hard_shutdown"
+end
+
type pci_info =
{
@@ -200,14 +212,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 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"
-
-external vfb_add : vfb_info -> domid -> unit = "stub_xl_vfb_add"
-external vfb_clean_shutdown : domid -> unit = "stub_vfb_clean_shutdown"
-external vfb_hard_shutdown : domid -> unit = "stub_vfb_hard_shutdown"
-
external pci_add : pci_info -> domid -> unit = "stub_xl_pci_add"
external pci_remove : pci_info -> domid -> unit = "stub_xl_pci_remove"
external pci_shutdown : domid -> unit = "stub_xl_pci_shutdown"
diff -r 06caff5991c6 -r 10db4482d72a 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
@@ -134,27 +134,38 @@ module Device_console : sig
external add : t -> build_state -> domid -> unit =
"stub_xl_device_console_add"
end
-type vkb_info =
-{
- backend_domid : domid;
- devid : int;
-}
+module Device_vkb : sig
+ type t =
+ {
+ backend_domid : domid;
+ devid : int;
+ }
+
+ external add : t -> domid -> unit = "stub_xl_device_vkb_add"
+ external clean_shutdown : domid -> unit =
"stub_xl_device_vkb_clean_shutdown"
+ external hard_shutdown : domid -> unit =
"stub_xl_device_vkb_hard_shutdown"
+end
-type vfb_info =
-{
- backend_domid : domid;
- devid : int;
- vnc : bool;
- vnclisten : string;
- vncpasswd : string;
- vncdisplay : int;
- vncunused : bool;
- keymap : string;
- sdl : bool;
- opengl : bool;
- display : string;
- xauthority : string;
-}
+module Device_vfb : sig
+ type t =
+ {
+ backend_domid : domid;
+ devid : int;
+ vnc : bool;
+ vnclisten : string;
+ vncpasswd : string;
+ vncdisplay : int;
+ vncunused : bool;
+ keymap : string;
+ sdl : bool;
+ opengl : bool;
+ display : string;
+ xauthority : string;
+ }
+ external add : t -> domid -> unit = "stub_xl_device_vfb_add"
+ external clean_shutdown : domid -> unit =
"stub_xl_device_vfb_clean_shutdown"
+ external hard_shutdown : domid -> unit =
"stub_xl_device_vfb_hard_shutdown"
+end
type pci_info =
{
@@ -200,14 +211,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 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"
-
-external vfb_add : vfb_info -> domid -> unit = "stub_xl_vfb_add"
-external vfb_clean_shutdown : domid -> unit = "stub_vfb_clean_shutdown"
-external vfb_hard_shutdown : domid -> unit = "stub_vfb_hard_shutdown"
-
external pci_add : pci_info -> domid -> unit = "stub_xl_pci_add"
external pci_remove : pci_info -> domid -> unit = "stub_xl_pci_remove"
external pci_shutdown : domid -> unit = "stub_xl_pci_shutdown"
diff -r 06caff5991c6 -r 10db4482d72a 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
@@ -456,7 +456,7 @@ value stub_xl_device_console_add(value i
CAMLreturn(Val_unit);
}
-value stub_xl_vkb_add(value info, value domid)
+value stub_xl_device_vkb_add(value info, value domid)
{
CAMLparam2(info, domid);
libxl_device_vkb c_info;
@@ -474,7 +474,7 @@ value stub_xl_vkb_add(value info, value
CAMLreturn(Val_unit);
}
-value stub_xl_vkb_clean_shutdown(value domid)
+value stub_xl_device_vkb_clean_shutdown(value domid)
{
CAMLparam1(domid);
int ret;
@@ -489,7 +489,7 @@ value stub_xl_vkb_clean_shutdown(value d
CAMLreturn(Val_unit);
}
-value stub_xl_vkb_hard_shutdown(value domid)
+value stub_xl_device_vkb_hard_shutdown(value domid)
{
CAMLparam1(domid);
int ret;
@@ -504,7 +504,7 @@ value stub_xl_vkb_hard_shutdown(value do
CAMLreturn(Val_unit);
}
-value stub_xl_vfb_add(value info, value domid)
+value stub_xl_device_vfb_add(value info, value domid)
{
CAMLparam2(info, domid);
libxl_device_vfb c_info;
@@ -522,7 +522,7 @@ value stub_xl_vfb_add(value info, value
CAMLreturn(Val_unit);
}
-value stub_xl_vfb_clean_shutdown(value domid)
+value stub_xl_device_vfb_clean_shutdown(value domid)
{
CAMLparam1(domid);
int ret;
@@ -537,7 +537,7 @@ value stub_xl_vfb_clean_shutdown(value d
CAMLreturn(Val_unit);
}
-value stub_xl_vfb_hard_shutdown(value domid)
+value stub_xl_device_vfb_hard_shutdown(value domid)
{
CAMLparam1(domid);
int ret;
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home