From c56ea12f098520619ba6ecc382d29a8a3eed0e06 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Sat, 28 Apr 2018 21:22:07 +0800 Subject: [PATCH] HV cleanup: assert on vm setup cpu px Make assert on max px cnt of boot cpu data, since it shouldn't happen if px data is properly initialized in boot process. Signed-off-by: Victor Sun Acked-by: Kevin Tian --- arch/x86/guest/pm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/guest/pm.c b/arch/x86/guest/pm.c index 0dabbbaca..ecb465feb 100644 --- a/arch/x86/guest/pm.c +++ b/arch/x86/guest/pm.c @@ -70,11 +70,10 @@ static void vm_setup_cpu_px(struct vm *vm) return; } - if (boot_cpu_data.state_info.px_cnt > MAX_PSTATE) { - vm->pm.px_cnt = MAX_PSTATE; - } else { - vm->pm.px_cnt = boot_cpu_data.state_info.px_cnt; - } + ASSERT ((boot_cpu_data.state_info.px_cnt <= MAX_PSTATE), + "failed to setup cpu px"); + + vm->pm.px_cnt = boot_cpu_data.state_info.px_cnt; px_data_size = vm->pm.px_cnt * sizeof(struct cpu_px_data);