From fbb67af9fd17c8b3e8f1599dab4b4b05e83bcd22 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 30 Aug 2018 14:00:25 +0300 Subject: [PATCH] x86: cpu -- Don't exit early if --cpu-cap=ins specified Since we're using bintmaps for options don't exit early if --cpu-cap=ins specified because there might be a combination of options. Signed-off-by: Cyrill Gorcunov Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by: Andrei Vagin --- criu/arch/x86/cpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c index a3f173b31..ce62cb7cf 100644 --- a/criu/arch/x86/cpu.c +++ b/criu/arch/x86/cpu.c @@ -287,8 +287,10 @@ static int cpu_validate_features(compel_cpuinfo_t *cpu_info) /* * Capability on instructions level only. */ - if (opts.cpu_cap & CPU_CAP_INS) - return cpu_validate_ins_features(cpu_info); + if (opts.cpu_cap & CPU_CAP_INS) { + if (cpu_validate_ins_features(cpu_info)) + return -1; + } /* * Strict capability mode. Everything must match.