From: Edwin Török Date: Tue, 15 Dec 2020 12:35:11 +0000 (+0100) Subject: tools/ocaml/xenstored: unify watch firing X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1319 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0911dfad0fbadee2ffaf1da1a8c596b750fd21d4;p=xen.git 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 Acked-by: Christian Lindig Reviewed-by: Andrew Cooper --- 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 =