aboutsummaryrefslogtreecommitdiffstats
path: root/tools/ocaml
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-12-09 16:19:36 +0000
committerIan Campbell <ian.campbell@citrix.com>2011-12-09 16:19:36 +0000
commit1878046a73df7ea3ee86b881f313e5a9aadbff66 (patch)
tree7c153aa411c19276317c00d3d1d0df35ef4ae21f /tools/ocaml
parent18f93842ac3c2ca4e985497ea5e9f4d7e8fdfeaf (diff)
downloadxen-1878046a73df7ea3ee86b881f313e5a9aadbff66.tar.gz
xen-1878046a73df7ea3ee86b881f313e5a9aadbff66.tar.bz2
xen-1878046a73df7ea3ee86b881f313e5a9aadbff66.zip
oxenstored: Remove support for PQ defined operations.
It is unused. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson.citrix.com> Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/ocaml')
-rw-r--r--tools/ocaml/libs/xb/op.ml13
-rw-r--r--tools/ocaml/libs/xb/xb.mli3
2 files changed, 0 insertions, 16 deletions
diff --git a/tools/ocaml/libs/xb/op.ml b/tools/ocaml/libs/xb/op.ml
index 97e38f236e..1ce72da348 100644
--- a/tools/ocaml/libs/xb/op.ml
+++ b/tools/ocaml/libs/xb/op.ml
@@ -22,9 +22,6 @@ type operation = Debug | Directory | Read | Getperms |
Resume | Set_target
| Restrict
-(* There are two sets of XB operations: the one coming from open-source and *)
-(* the one coming from our private patch queue. These operations *)
-(* in two differents arrays for make easier the forward compatibility *)
let operation_c_mapping =
[| Debug; Directory; Read; Getperms;
Watch; Unwatch; Transaction_start;
@@ -34,12 +31,6 @@ let operation_c_mapping =
Resume; Set_target; Restrict |]
let size = Array.length operation_c_mapping
-(* [offset_pq] has to be the same as in <xen/io/xs_wire.h> *)
-let offset_pq = size
-let operation_c_mapping_pq =
- [| |]
-let size_pq = Array.length operation_c_mapping_pq
-
let array_search el a =
let len = Array.length a in
let rec search i =
@@ -50,14 +41,10 @@ let array_search el a =
let of_cval i =
if i >= 0 && i < size
then operation_c_mapping.(i)
- else if i >= offset_pq && i < offset_pq + size_pq
- then operation_c_mapping_pq.(i-offset_pq)
else raise Not_found
let to_cval op =
- try
array_search op operation_c_mapping
- with _ -> offset_pq + array_search op operation_c_mapping_pq
let to_string ty =
match ty with
diff --git a/tools/ocaml/libs/xb/xb.mli b/tools/ocaml/libs/xb/xb.mli
index 20fe762d5d..1dde52db1e 100644
--- a/tools/ocaml/libs/xb/xb.mli
+++ b/tools/ocaml/libs/xb/xb.mli
@@ -25,9 +25,6 @@ module Op :
| Restrict
val operation_c_mapping : operation array
val size : int
- val offset_pq : int
- val operation_c_mapping_pq : 'a array
- val size_pq : int
val array_search : 'a -> 'a array -> int
val of_cval : int -> operation
val to_cval : operation -> int