[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging] tools/ocaml: fix compiler warnings



commit a0aeab27ee0e1e221181a3083908dc2d4e1553ee
Author:     Edwin Török <edvin.torok@xxxxxxxxxx>
AuthorDate: Fri Jul 29 18:53:28 2022 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Aug 5 17:30:57 2022 +0100

    tools/ocaml: fix compiler warnings
    
    Fix compiler warning about:
    * unused value
    * ambiguous documentation comment
    * non-principal type inference (compiler version dependent)
    
    No functional change.
    
    Signed-off-by: Edwin Török <edvin.torok@xxxxxxxxxx>
    Acked-by: Christian Lindig <christian.lindig@xxxxxxxxxx>
---
 tools/ocaml/xenstored/connection.ml | 1 -
 tools/ocaml/xenstored/process.ml    | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ocaml/xenstored/connection.ml 
b/tools/ocaml/xenstored/connection.ml
index 65f99ea6f2..8602a14ed1 100644
--- a/tools/ocaml/xenstored/connection.ml
+++ b/tools/ocaml/xenstored/connection.ml
@@ -313,7 +313,6 @@ let is_bad con = match con.dom with None -> false | Some 
dom -> Domain.is_bad_do
 let has_extra_connection_data con =
        let has_in = has_input con || has_partial_input con in
        let has_out = has_output con in
-       let has_socket = con.dom = None in
        let has_nondefault_perms = make_perm con.dom <> con.perm in
        has_in || has_out
        (* TODO: what about SIGTERM, should use systemd to store FDS
diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml
index 27790d4a5c..86eed02413 100644
--- a/tools/ocaml/xenstored/process.ml
+++ b/tools/ocaml/xenstored/process.ml
@@ -59,7 +59,7 @@ let split_one_path data con =
 
 let process_watch t cons =
        let oldroot = t.Transaction.oldroot in
-       let newroot = Store.get_root t.store in
+       let newroot = Store.get_root t.Transaction.store in
        let ops = Transaction.get_paths t |> List.rev in
        let do_op_watch op cons =
                let recurse, oldroot, root = match (fst op) with
@@ -491,7 +491,7 @@ let transaction_replay c t doms cons =
                        ignore @@ Connection.end_transaction c tid None
                )
 
-let do_watch con t _domains cons data =
+let do_watch con _t _domains cons data =
        let (node, token) =
                match (split None '\000' data) with
                | [node; token; ""]   -> node, token
@@ -651,6 +651,7 @@ let maybe_ignore_transaction = function
 
 
 let () = Printexc.record_backtrace true
+
 (**
  * Nothrow guarantee.
  *)
--
generated by git-patchbot for /home/xen/git/xen.git#staging



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.