mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
libxl: fix dom0 minimum memory threshold check
libxl_set_memory_target tries to set the memory target for a given domain to new_target_memkb. The function includes a check to make sure that dom0's memory is not reduced below a minimal threshold ie. LIBXL_MIN_DOM0_MEM. However, this check is performed before the new_target_memkb variable is properly initialised - when the value is always zero. This means that the check always fails. Fix this by moving the test to happen after the proper initialisation of new_target_memkb. Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
1 parent
576b10f44c
commit
1e346e3f47
1 file changed
+7
-6
+7
-6
@@ -2927,12 +2927,6 @@ retry_transaction:
|
||||
abort = 1;
|
||||
goto out;
|
||||
}
|
||||
if (!domid && new_target_memkb < LIBXL_MIN_DOM0_MEM) {
|
||||
LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
|
||||
"new target for dom0 is below the minimum threshold\n");
|
||||
abort = 1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (relative)
|
||||
new_target_memkb = current_target_memkb + target_memkb;
|
||||
@@ -2946,6 +2940,13 @@ retry_transaction:
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!domid && new_target_memkb < LIBXL_MIN_DOM0_MEM) {
|
||||
LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
|
||||
"new target %d for dom0 is below the minimum threshold\n",
|
||||
new_target_memkb);
|
||||
abort = 1;
|
||||
goto out;
|
||||
}
|
||||
videoram_s = libxl__xs_read(&gc, t, libxl__sprintf(&gc,
|
||||
"%s/memory/videoram", dompath));
|
||||
videoram = videoram_s ? atoi(videoram_s) : 0;
|
||||
|
||||