From: David Scott <dave.scott@eu.citrix.com>
To: xen-devel@lists.xensource.com
Subject: [PATCH 03 of 14] tools: ocaml: rename the disk_info types and functions
Date: Wed, 30 Mar 2011 19:05:24 +0100 [thread overview]
Message-ID: <6ca09bec9c49ccf3b936.1301508324@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 6ca09bec9c49ccf3b93606fd3f5fd807c9438cc1
# Parent 3050abaa45d6da7edeb8c7f4efd1ae8658740329
tools: ocaml: rename the disk_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>
diff -r 3050abaa45d6 -r 6ca09bec9c49 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
@@ -82,16 +82,21 @@ type disk_phystype =
| PHYSTYPE_FILE
| PHYSTYPE_PHY
-type disk_info =
-{
- backend_domid : domid;
- physpath : string;
- phystype : disk_phystype;
- virtpath : string;
- unpluggable : bool;
- readwrite : bool;
- is_cdrom : bool;
-}
+module Device_disk = struct
+ type t =
+ {
+ backend_domid : domid;
+ physpath : string;
+ phystype : disk_phystype;
+ virtpath : string;
+ unpluggable : bool;
+ readwrite : bool;
+ is_cdrom : bool;
+ }
+
+ external add : t -> domid -> unit = "stub_xl_device_disk_add"
+ external del : t -> domid -> unit = "stub_xl_device_disk_del"
+end
type nic_type =
| NICTYPE_IOEMU
@@ -180,9 +185,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 disk_add : disk_info -> domid -> unit = "stub_xl_disk_add"
-external disk_remove : disk_info -> domid -> unit = "stub_xl_disk_remove"
-
external console_add : console_info -> build_state -> domid -> unit = "stub_xl_console_add"
external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add"
diff -r 3050abaa45d6 -r 6ca09bec9c49 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
@@ -82,16 +82,21 @@ type disk_phystype =
| PHYSTYPE_FILE
| PHYSTYPE_PHY
-type disk_info =
-{
- backend_domid : domid;
- physpath : string;
- phystype : disk_phystype;
- virtpath : string;
- unpluggable : bool;
- readwrite : bool;
- is_cdrom : bool;
-}
+module Device_disk : sig
+ type t =
+ {
+ backend_domid : domid;
+ physpath : string;
+ phystype : disk_phystype;
+ virtpath : string;
+ unpluggable : bool;
+ readwrite : bool;
+ is_cdrom : bool;
+ }
+
+ external add : t -> domid -> unit = "stub_xl_device_disk_add"
+ external del : t -> domid -> unit = "stub_xl_device_disk_del"
+end
type nic_type =
| NICTYPE_IOEMU
@@ -180,9 +185,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 disk_add : disk_info -> domid -> unit = "stub_xl_disk_add"
-external disk_remove : disk_info -> domid -> unit = "stub_xl_disk_remove"
-
external console_add : console_info -> build_state -> domid -> unit = "stub_xl_console_add"
external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add"
diff -r 3050abaa45d6 -r 6ca09bec9c49 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
@@ -361,7 +361,7 @@ static value Val_physinfo(libxl_physinfo
CAMLreturn(v);
}
-value stub_xl_disk_add(value info, value domid)
+value stub_xl_device_disk_add(value info, value domid)
{
CAMLparam2(info, domid);
libxl_device_disk c_info;
@@ -379,7 +379,7 @@ value stub_xl_disk_add(value info, value
CAMLreturn(Val_unit);
}
-value stub_xl_disk_remove(value info, value domid)
+value stub_xl_device_disk_del(value info, value domid)
{
CAMLparam2(info, domid);
libxl_device_disk c_info;
@@ -392,7 +392,7 @@ value stub_xl_disk_remove(value info, va
INIT_CTX();
ret = libxl_device_disk_del(&ctx, &c_info, 0);
if (ret != 0)
- failwith_xl("disk_remove", &lg);
+ failwith_xl("disk_del", &lg);
FREE_CTX();
CAMLreturn(Val_unit);
}
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 ` David Scott [this message]
2011-03-30 18:05 ` [PATCH 04 of 14] tools: ocaml: rename the console " David Scott
2011-03-30 18:05 ` [PATCH 05 of 14] tools: ocaml: rename the vkb " David Scott
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=6ca09bec9c49ccf3b936.1301508324@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).