[Xen-changelog] [xen-unstable] oxenstored: Remove support for PQ defined operations.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1323447576 0
# Node ID c24b94471d5529cdf86332dc0c97d1e1280457de
# Parent  595f38e12479859630344559fae290f566e7ef40
oxenstored: Remove support for PQ defined operations.

It is unused.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---


diff -r 595f38e12479 -r c24b94471d55 tools/ocaml/libs/xb/op.ml
--- a/tools/ocaml/libs/xb/op.ml Fri Dec 09 12:01:16 2011 +0000
+++ b/tools/ocaml/libs/xb/op.ml Fri Dec 09 16:19:36 2011 +0000
@@ -22,9 +22,6 @@
                  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 @@
            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 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 -r 595f38e12479 -r c24b94471d55 tools/ocaml/libs/xb/xb.mli
--- a/tools/ocaml/libs/xb/xb.mli        Fri Dec 09 12:01:16 2011 +0000
+++ b/tools/ocaml/libs/xb/xb.mli        Fri Dec 09 16:19:36 2011 +0000
@@ -25,9 +25,6 @@
       | 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

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