[CRIU] [PATCH 18/18] x86: cpu -- Drop feature bypassing

[Cyrill Gorcunov]

We fully support xsaves, so no need for noxsaves temporary
option anymore.

This reverts commit ba93feb5f0f017f2ee498f6ee2db58bcaf817501.

Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
 criu/arch/aarch64/cpu.c |  5 -----
 criu/arch/arm/cpu.c     |  5 -----
 criu/arch/ppc64/cpu.c   |  5 -----
 criu/arch/s390/cpu.c    |  5 -----
 criu/arch/x86/cpu.c     | 24 ------------------------
 criu/crtools.c          |  5 -----
 criu/include/cpu.h      |  1 -
 7 files changed, 50 deletions(-)

diff --git a/criu/arch/aarch64/cpu.c b/criu/arch/aarch64/cpu.c
index ef339f2f1f78..34313fb1569b 100644
--- a/criu/arch/aarch64/cpu.c
+++ b/criu/arch/aarch64/cpu.c
@@ -38,8 +38,3 @@ int cpuinfo_check(void)
 {
 	return -ENOTSUP;
 }
-
-int cpu_parse_option(const char *opt)
-{
-	return -ENOTSUP;
-}
diff --git a/criu/arch/arm/cpu.c b/criu/arch/arm/cpu.c
index ef339f2f1f78..34313fb1569b 100644
--- a/criu/arch/arm/cpu.c
+++ b/criu/arch/arm/cpu.c
@@ -38,8 +38,3 @@ int cpuinfo_check(void)
 {
 	return -ENOTSUP;
 }
-
-int cpu_parse_option(const char *opt)
-{
-	return -ENOTSUP;
-}
diff --git a/criu/arch/ppc64/cpu.c b/criu/arch/ppc64/cpu.c
index cdee8c72fed8..4fcfb065a75d 100644
--- a/criu/arch/ppc64/cpu.c
+++ b/criu/arch/ppc64/cpu.c
@@ -140,8 +140,3 @@ int cpuinfo_check(void)
 
 	return 0;
 }
-
-int cpu_parse_option(const char *opt)
-{
-	return -1;
-}
diff --git a/criu/arch/s390/cpu.c b/criu/arch/s390/cpu.c
index 5f6b83f70a40..f93666ed68a3 100644
--- a/criu/arch/s390/cpu.c
+++ b/criu/arch/s390/cpu.c
@@ -156,8 +156,3 @@ int cpuinfo_check(void)
 		return 1;
 	return 0;
 }
-
-int cpu_parse_option(const char *opt)
-{
-	return -1;
-}
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index 6ce2e88f37dd..35660929d17a 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -438,27 +438,3 @@ int cpuinfo_check(void)
 
 	return 0;
 }
-
-int cpu_parse_option(const char *opt)
-{
-	static struct {
-		const char	*name;
-		unsigned int	feature;
-	} filters[] = {
-		{
-			.name		= "noxsaves",
-			.feature	= X86_FEATURE_XSAVES,
-		},
-	};
-
-	size_t i;
-
-	for (i = 0; i < ARRAY_SIZE(filters); i++) {
-		if (strncmp(opt, filters[i].name, strlen(filters[i].name)))
-			continue;
-		compel_cpu_clear_feature(filters[i].feature);
-		return strlen(filters[i].name);
-	}
-
-	return -1;
-}
diff --git a/criu/crtools.c b/criu/crtools.c
index 10fa435aa04b..89fb948e8463 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -153,11 +153,6 @@ static int parse_cpu_cap(struct cr_options *opts, const char *optarg)
 		} else if (!strncmp(optarg, "ins", 3)) {
 			____cpu_set_cap(opts, CPU_CAP_INS, inverse);
 			optarg += 3;
-		} else if (!strncmp(optarg, "op=", 3)) {
-			int pos = cpu_parse_option(&optarg[3]);
-			if (pos <= 0)
-				goto Esyntax;
-			optarg += pos + 3;
 		} else
 			goto Esyntax;
 	}
diff --git a/criu/include/cpu.h b/criu/include/cpu.h
index 09b3c789980b..e30696790e72 100644
--- a/criu/include/cpu.h
+++ b/criu/include/cpu.h
@@ -8,6 +8,5 @@ extern int cpu_dump_cpuinfo(void);
 extern int cpu_validate_cpuinfo(void);
 extern int cpuinfo_dump(void);
 extern int cpuinfo_check(void);
-extern int cpu_parse_option(const char *opt);
 
 #endif /* __CR_CPU_H__ */
-- 
2.14.4