[xen staging-4.14] tools/ocaml/xenstored: unify watch firing

[patchbot@xxxxxxx]

commit 6fa3e05ff5a8083a0be29ac66d4d94bb57e252f2
Author:     Edwin Török <edvin.torok@xxxxxxxxxx>
AuthorDate: Tue Dec 15 14:06:48 2020 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Dec 15 14:06:48 2020 +0100

    tools/ocaml/xenstored: unify watch firing
    
    This will make it easier insert additional checks in a follow-up patch.
    All watches are now fired from a single function.
    
    This is part of XSA-115.
    
    Signed-off-by: Edwin Török <edvin.torok@xxxxxxxxxx>
    Acked-by: Christian Lindig <christian.lindig@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 tools/ocaml/xenstored/connection.ml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/ocaml/xenstored/connection.ml 
b/tools/ocaml/xenstored/connection.ml
index 24750ada43..e5df62d9e7 100644
--- a/tools/ocaml/xenstored/connection.ml
+++ b/tools/ocaml/xenstored/connection.ml
@@ -210,8 +210,7 @@ let fire_watch watch path =
                end else
                        path
        in
-       let data = Utils.join_by_null [ new_path; watch.token; "" ] in
-       send_reply watch.con Transaction.none 0 Xenbus.Xb.Op.Watchevent data
+       fire_single_watch { watch with path = new_path }
 
 (* Search for a valid unused transaction id. *)
 let rec valid_transaction_id con proposed_id =
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.14