[CRIU] [PATCH 10/12] x86: cpu -- Don't exit early if --cpu-cap=ins specified

[Cyrill Gorcunov]

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 <gorcunov at gmail.com>
---
 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 a3f173b31c11..ce62cb7cf62a 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.
-- 
2.17.1