[xen master] tools/ocaml: Delete the Xenctrl.with_intf wrapper

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] tools/ocaml: Delete the Xenctrl.with_intf wrapper

patchbot
commit 81946a73dc975a7dafe9017a8e61d1e64fdbedbf
Author:     Andrew Cooper <[hidden email]>
AuthorDate: Wed Oct 3 14:11:20 2018 +0100
Commit:     Andrew Cooper <[hidden email]>
CommitDate: Thu Oct 4 14:54:36 2018 +0100

    tools/ocaml: Delete the Xenctrl.with_intf wrapper
   
    This wrapper hides an opening and closing of the xenctrl handle, which amongst
    other things opens and closes multiple device files.
   
    A process should create one handle at the start of day and reuse that; indeed
    there is no guarentee that the process will retain sufficient permissions to
    re-open /dev/xen/privcmd at a later point.
   
    With the final user of Xenctrl.with_intf removed, drop the wrapper entirely.
   
    Signed-off-by: Andrew Cooper <[hidden email]>
    Acked-by: Christian Lindig <[hidden email]>
---
 tools/ocaml/libs/xc/xenctrl.ml  | 6 ------
 tools/ocaml/libs/xc/xenctrl.mli | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml
index 40fbd3790f..955dd92546 100644
--- a/tools/ocaml/libs/xc/xenctrl.ml
+++ b/tools/ocaml/libs/xc/xenctrl.ml
@@ -141,12 +141,6 @@ type handle
 external interface_open: unit -> handle = "stub_xc_interface_open"
 external interface_close: handle -> unit = "stub_xc_interface_close"
 
-let with_intf f =
- let xc = interface_open () in
- let r = try f xc with exn -> interface_close xc; raise exn in
- interface_close xc;
- r
-
 external domain_create: handle -> domctl_create_config -> domid
        = "stub_xc_domain_create"
 
diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli
index 906ce9486b..eeed24fa96 100644
--- a/tools/ocaml/libs/xc/xenctrl.mli
+++ b/tools/ocaml/libs/xc/xenctrl.mli
@@ -108,7 +108,7 @@ exception Error of string
 type handle
 external interface_open : unit -> handle = "stub_xc_interface_open"
 external interface_close : handle -> unit = "stub_xc_interface_close"
-val with_intf : (handle -> 'a) -> 'a
+
 external domain_create : handle -> domctl_create_config -> domid
   = "stub_xc_domain_create"
 external domain_sethandle : handle -> domid -> string -> unit = "stub_xc_domain_sethandle"
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog