[[PATCH for-4.17 v1]] tools/ocaml/xenstored/xenstored.ml: fix incorrect scope

Edwin Török posted 1 patch 1 year, 5 months ago
Test gitlab-ci failed
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/356deefe1251ac353b346762df94a134c02508f0.1668104890.git.edvin.torok@citrix.com
tools/ocaml/xenstored/xenstored.ml | 1 -
1 file changed, 1 deletion(-)
[[PATCH for-4.17 v1]] tools/ocaml/xenstored/xenstored.ml: fix incorrect scope
Posted by Edwin Török 1 year, 5 months ago
A debug statement got introduced and code not reindented
(as it was part of a security fix and was trying to avoid that),
however that resulted in *only* the debug statement being part of the 'if',
and everything else outside of it.
This results in some unnecessary ring checks for domains which otherwise
have IO credit.

Remove the debug line.

Fixes: 42f0581a91 ("tools/oxenstored: Implement live update for socket connections")

Signed-off-by: Edwin Török <edvin.torok@citrix.com>
---
Reason for inclusion in 4.17:
- bugfix for commit already in master

Changes since v3:
- new in v4
---
 tools/ocaml/xenstored/xenstored.ml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml
index ffd43a4eee..79f04178d8 100644
--- a/tools/ocaml/xenstored/xenstored.ml
+++ b/tools/ocaml/xenstored/xenstored.ml
@@ -476,7 +476,6 @@ let _ =
 	let ring_scan_checker dom =
 		(* no need to scan domains already marked as for processing *)
 		if not (Domain.get_io_credit dom > 0) then
-			debug "Looking up domid %d" (Domain.get_id dom);
 			let con = Connections.find_domain cons (Domain.get_id dom) in
 			if not (Connection.has_more_work con) then (
 				Process.do_output store cons domains con;
-- 
2.34.1


Re: [[PATCH for-4.17 v1]] tools/ocaml/xenstored/xenstored.ml: fix incorrect scope
Posted by Christian Lindig 1 year, 5 months ago

> On 10 Nov 2022, at 18:28, Edwin Török <edvin.torok@citrix.com> wrote:
> 
> A debug statement got introduced and code not reindented
> (as it was part of a security fix and was trying to avoid that),
> however that resulted in *only* the debug statement being part of the 'if',
> and everything else outside of it.
> This results in some unnecessary ring checks for domains which otherwise
> have IO credit.
> 
> Remove the debug line.
> 
> Fixes: 42f0581a91 ("tools/oxenstored: Implement live update for socket connections")
> 
> Signed-off-by: Edwin Török <edvin.torok@citrix.com>
> ---
> Reason for inclusion in 4.17:
> - bugfix for commit already in master

Acked-by: Christian Lindig <christian.lindig@citrix.com>