diff options
Diffstat (limited to '0025-xl-move-freemem-s-credit-expired-loop-exit.patch')
-rw-r--r-- | 0025-xl-move-freemem-s-credit-expired-loop-exit.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/0025-xl-move-freemem-s-credit-expired-loop-exit.patch b/0025-xl-move-freemem-s-credit-expired-loop-exit.patch deleted file mode 100644 index a3b2e2b..0000000 --- a/0025-xl-move-freemem-s-credit-expired-loop-exit.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c37099426ea678c1d5b6c99ae5ad6834f4edd2e6 Mon Sep 17 00:00:00 2001 -From: Jan Beulich <jbeulich@suse.com> -Date: Wed, 27 Jul 2022 09:29:31 +0200 -Subject: [PATCH 025/126] 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 <jbeulich@suse.com> -Reviewed-by: Anthony PERARD <anthony.perard@citrix.com> -master commit: d8f8cb8bdd02fad3b6986ae93511f750fa7f7e6a -master date: 2022-07-18 17:48:18 +0200 ---- - tools/xl/xl_vmcontrol.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c -index 5dee7730ca76..d1c6f8aae67a 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, --- -2.37.4 - |