On 22/01/2016 15:15, Luiz Capitulino wrote:
> When -mem-prealloc is passed on the command-line, the expected
> behavior is to exit if the hugepage allocation fails. However,
> this behavior is broken since commit cc57501dee which made
> hugepage allocation fall back to regular ram in case of faliure.
>
> This commit restores the expected behavior for -mem-prealloc.
>
> Signed-off-by: Luiz Capitulino
> ---
> numa.c | 9 +
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/numa.c b/numa.c
> index 425ef8d..0e1638d 100644
> --- a/numa.c
> +++ b/numa.c
> @@ -418,12 +418,13 @@ static void allocate_system_memory_nonnuma(MemoryRegion
> *mr, Object *owner,
> Error *err = NULL;
> memory_region_init_ram_from_file(mr, owner, name, ram_size, false,
> mem_path, );
> -
> -/* Legacy behavior: if allocation failed, fall back to
> - * regular RAM allocation.
> - */
> if (err) {
> error_report_err(err);
> +if (mem_prealloc)
> +exit(1);
> +/* Legacy behavior: if allocation failed, fall back to
> + * regular RAM allocation.
> + */
> memory_region_init_ram(mr, owner, name, ram_size, _fatal);
> }
> #else
>
Right, patch cc57501dee did the correct change but it was insufficient.
I'll add the braces for you and queue the patch.
Paolo