From: David Scott <dave.scott@eu.citrix.com>
To: xen-devel@lists.xensource.com
Subject: [PATCH 05 of 14] tools: ocaml: rename the vkb types and functions
Date: Wed, 30 Mar 2011 19:05:26 +0100 [thread overview]
Message-ID: <e465e648db5f43d252a1.1301508326@localhost.localdomain> (raw)
In-Reply-To: <patchbomb.1301508321@localhost.localdomain>
# HG changeset patch
# User David Scott <dave.scott@eu.citrix.com>
# Date 1301507668 -3600
# Node ID e465e648db5f43d252a10594cbf68b2ee3732fd5
# Parent 6aa054dd7ba1d9bddb06a9499c1f292550f9435b
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@eu.citrix.com>
diff -r 6aa054dd7ba1 -r e465e648db5f 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 =
{
@@ -189,14 +201,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 6aa054dd7ba1 -r e465e648db5f 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 =
{
@@ -189,14 +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 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 6aa054dd7ba1 -r e465e648db5f 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
@@ -454,7 +454,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;
@@ -473,7 +473,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;
@@ -488,7 +488,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;
@@ -503,7 +503,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;
next prev parent reply other threads:[~2011-03-30 18:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-30 18:05 [PATCH 00 of 14] Improvements to libxl VIF hotplug and ocaml bindings (v2) David Scott
2011-03-30 18:05 ` [PATCH 01 of 14] libxl: fix memory management in "xl network-attach" David Scott
2011-03-31 18:19 ` Ian Jackson
2011-03-30 18:05 ` [PATCH 02 of 14] tools: ocaml: rename the device_nic types and functions David Scott
2011-03-30 18:05 ` [PATCH 03 of 14] tools: ocaml: rename the disk_info " David Scott
2011-03-30 18:05 ` [PATCH 04 of 14] tools: ocaml: rename the console " David Scott
2011-03-30 18:05 ` David Scott [this message]
2011-03-30 18:05 ` [PATCH 06 of 14] tools: ocaml: rename the pci " David Scott
2011-03-30 18:05 ` [PATCH 07 of 14] tools: ocaml: remove the domain_make and domain_build functions since they don't work David Scott
2011-03-30 18:05 ` [PATCH 08 of 14] tools: ocaml: rename the create_info types and functions David Scott
2011-03-30 18:05 ` [PATCH 09 of 14] tools: ocaml: rename the build_info " David Scott
2011-03-30 18:05 ` [PATCH 10 of 14] tools: ocaml: rename the device_build_state " David Scott
2011-03-30 18:05 ` [PATCH 11 of 14] tools: ocaml: rename the physinfo " David Scott
2011-03-30 18:05 ` [PATCH 12 of 14] tools: ocaml: rename the sched_credit " David Scott
2011-03-30 18:05 ` [PATCH 13 of 14] libxl: add NIC QoS parameters David Scott
2011-03-31 9:13 ` Ian Campbell
2011-03-30 18:05 ` [PATCH 14 of 14] tools: ocaml: add NIC QoS parameters to the ocaml libxl interface David Scott
2011-03-31 8:36 ` [PATCH 00 of 14] Improvements to libxl VIF hotplug and ocaml bindings (v2) Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e465e648db5f43d252a1.1301508326@localhost.localdomain \
--to=dave.scott@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).