From 3b6613b7a579279eed913829928dde66edff7d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Wed, 2 Nov 2022 13:57:28 +0000 Subject: [PATCH] CA-140252: fix flag handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The flag was only turning off the debug message but not the code itself. Indentation now makes it very clear that this is wrong, so lets fix it. Currently this workaround (from the 6.x era is still on in the .conf file, but at some point we may want to turn it off) Signed-off-by: Edwin Török --- ocaml/xenopsd/xc/domain.ml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ocaml/xenopsd/xc/domain.ml b/ocaml/xenopsd/xc/domain.ml index 5e58e01509b..06e728896fc 100644 --- a/ocaml/xenopsd/xc/domain.ml +++ b/ocaml/xenopsd/xc/domain.ml @@ -786,11 +786,12 @@ let get_action_request ~xs domid = try Some (xs.Xs.read path) with Xs_protocol.Enoent _ -> None let maybe_ca_140252_workaround ~xc ~vcpus domid = - if !Xenopsd.ca_140252_workaround then + if !Xenopsd.ca_140252_workaround then ( debug "Allocating %d I/O req evtchns in advance for device model" vcpus ; - for _ = 1 to vcpus do - ignore_int (Xenctrl.evtchn_alloc_unbound xc domid 0) - done + for _ = 1 to vcpus do + ignore_int (Xenctrl.evtchn_alloc_unbound xc domid 0) + done + ) (** create store and console channels *) let create_channels ~xc uuid domid =