diff options
Diffstat (limited to '0010-tools-oxenstored-Fix-incorrect-scope-after-an-if-sta.patch')
| -rw-r--r-- | 0010-tools-oxenstored-Fix-incorrect-scope-after-an-if-sta.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/0010-tools-oxenstored-Fix-incorrect-scope-after-an-if-sta.patch b/0010-tools-oxenstored-Fix-incorrect-scope-after-an-if-sta.patch deleted file mode 100644 index a8c427d..0000000 --- a/0010-tools-oxenstored-Fix-incorrect-scope-after-an-if-sta.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2e8d7a08bcd111fe21569e9ace1a047df76da949 Mon Sep 17 00:00:00 2001 -From: Andrew Cooper <andrew.cooper3@citrix.com> -Date: Fri, 11 Nov 2022 18:50:34 +0000 -Subject: [PATCH 10/89] tools/oxenstored: Fix incorrect scope after an if - statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A debug statement got inserted into a single-expression if statement. - -Insert brackets to give the intended meaning, rather than the actual meaning -where the "let con = Connections..." is outside and executed unconditionally. - -This results in some unnecessary ring checks for domains which otherwise have -IO credit. - -Fixes: 42f0581a91d4 ("tools/oxenstored: Implement live update for socket connections") -Reported-by: Edwin Török <edvin.torok@citrix.com> -Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> -Acked-by: Christian Lindig <christian.lindig@citrix.com> -(cherry picked from commit ee36179371fd4215a43fb179be2165f65c1cd1cd) ---- - tools/ocaml/xenstored/xenstored.ml | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml -index ffd43a4eee..c5dc7a28d0 100644 ---- a/tools/ocaml/xenstored/xenstored.ml -+++ b/tools/ocaml/xenstored/xenstored.ml -@@ -475,7 +475,7 @@ 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 -+ 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 ( -@@ -490,7 +490,8 @@ let _ = - let n = 32 + 2 * (Domains.number domains) in - info "found lazy domain %d, credit %d" (Domain.get_id dom) n; - Domain.set_io_credit ~n dom -- ) in -+ ) -+ ) in - - let last_stat_time = ref 0. in - let last_scan_time = ref 0. in --- -2.40.0 - |