Mailing List Archive

# HG changeset patch
# User David Scott <dave.scott@eu.citrix.com>
# Date 1301507668 -3600
# Node ID c814e6e9c50b4b07de1fa681cc175540bc09154e
# Parent 899e9e118e6fb504a703679ed13330505cba5c24
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>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff -r 899e9e118e6f -r c814e6e9c50b 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
@@ -191,9 +196,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 899e9e118e6f -r c814e6e9c50b 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
@@ -191,9 +196,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 899e9e118e6f -r c814e6e9c50b 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
@@ -368,7 +368,7 @@ static value Val_topologyinfo(libxl_topo
CAMLreturn(topologyinfo);
}

-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;
@@ -385,7 +385,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;
@@ -397,7 +397,7 @@ value stub_xl_disk_remove(value info, va
INIT_CTX();
ret = libxl_device_disk_del(ctx, Int_val(domid), &c_info, 0);
if (ret != 0)
- failwith_xl("disk_remove", &lg);
+ failwith_xl("disk_del", &lg);
FREE_CTX();
CAMLreturn(Val_unit);
}

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