From: Jan Beulich Date: Mon, 18 Jul 2022 15:48:18 +0000 (+0200) Subject: xl: move freemem()'s "credit expired" loop exit X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~427 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d8f8cb8bdd02fad3b6986ae93511f750fa7f7e6a;p=xen.git xl: move freemem()'s "credit expired" loop exit Move the "credit expired" loop exit to the middle of the loop, immediately after "return true". This way having reached the goal on the last iteration would be reported as success to the caller, rather than as "timed out". Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD --- diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index cd338a5422..8c29923f62 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -332,7 +332,7 @@ static bool freemem(uint32_t domid, libxl_domain_config *d_config) if (rc < 0) return false; - do { + for (;;) { time_t start; rc = libxl_get_free_memory(ctx, &free_memkb); @@ -342,6 +342,9 @@ static bool freemem(uint32_t domid, libxl_domain_config *d_config) if (free_memkb >= need_memkb) return true; + if (credit <= 0) + return false; + rc = libxl_set_memory_target(ctx, 0, free_memkb - need_memkb, 1, 0); if (rc < 0) return false; @@ -354,9 +357,7 @@ static bool freemem(uint32_t domid, libxl_domain_config *d_config) return false; credit -= difftime(time(NULL), start); - } while (credit > 0); - - return false; + } } static void reload_domain_config(uint32_t domid,