[Xen-changelog] [xen stable-4.1] oxenstored: Fix process.ml build after 070ab4c50593

[patchbot@xxxxxxx]

commit 5bf83fd0745fac6c48ea127fa271c7e2d62b15b5
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Mon Sep 9 15:30:42 2013 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Sep 9 17:30:53 2013 +0100

    oxenstored: Fix process.ml build after 070ab4c50593
    
    This change:
      070ab4c505934951f86f42dd8403cf62bc5822f0
      "oxenstored: Protect oxenstored from malicious domains"
    broke the build because it had an unresolved semantic (but not
    textual) conflict with
      c69fddbd5dfa3004aaf2d0f2dde00c9ec3dd6d5d
      "tools/ocaml: Remove log library from tools/ocaml/libs"
    (which is in 4.2 but not 4.1)
    
    Fix this by using the 4.1.x idiom in the new error handling introduced
    in 070ab4c50593.
    
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Acked-by: David Scott <dave.scott@xxxxxxxxxxxxx>
---
 tools/ocaml/xenstored/process.ml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml
index bd87646..5c81755 100644
--- a/tools/ocaml/xenstored/process.ml
+++ b/tools/ocaml/xenstored/process.ml
@@ -372,8 +372,8 @@ let do_input store cons doms con =
                try
                        Connection.do_input con
                with Failure exp ->
-                       error "caught exception %s" exp;
-                       error "got a bad client %s" (sprintf "%-8s" 
(Connection.get_domstr con));
+                       Logs.error "general" "caught exception %s" exp;
+                       Logs.error "general" "got a bad client %s" (sprintf 
"%-8s" (Connection.get_domstr con));
                        Connection.mark_as_bad con;
                        false
        in
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.1

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