@@ -78,6 +78,94 @@ static void test_cpu_features_tcg(void)
}
}
+static void test_cpu_features_kvm(void)
+{
+ int i;
+ kvm_allowed = true;
+ for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); ++i) {
+ FeatureWord w;
+ ObjectClass *oc;
+ X86CPU *cpu;
+ Error *error = NULL;
+ X86CPUDefinition *def = &builtin_x86_defs[i];
+ char features[] = "";
+
+ oc = x86_cpu_class_by_name(def->name);
+ cpu = X86_CPU(object_new(object_class_get_name(oc)));
+ x86_cpu_parse_featurestr(CPU(cpu), features, &error);
+
+ for (w = 0; w < FEATURE_WORDS; w++) {
+ uint32_t expected = (def->features[w] | default_features_all[w] |
+ kvm_default_features[w]) &
+ ~kvm_default_unset_features[w];
+ uint32_t actual = cpu->env.features[w] | cpu->filtered_features[w];
+ g_assert_cmpint(actual, ==, expected);
+ /*TODO: test this after moving feature filtering outside realizefn:
+ uint32_t expect_filtered = expected &
+ ~x86_cpu_get_supported_feature_word(w, true);
+ g_assert_cmpint(cpu->filtered_features[w], ==, expect_filtered);
+ */
+ }
+ object_unref(OBJECT(cpu));
+ }
+}
+
+static void test_host_cpu_features_kvm(void)
+{
+ FeatureWord w;
+ ObjectClass *oc;
+ X86CPU *cpu;
+ Error *error = NULL;
+ char features1[] = "migratable=off";
+ char features2[] = "migratable=off";
+ char features3[] = "migratable=off";
+
+ kvm_allowed = true;
+ oc = x86_cpu_class_by_name("host");
+
+ /* fake_cpuid() test mode: */
+ cpu = X86_CPU(object_new(object_class_get_name(oc)));
+ x86_cpu_parse_featurestr(CPU(cpu), features1, &error);
+
+ for (w = 0; w < FEATURE_WORDS; w++) {
+ FeatureWordInfo *wi = &feature_word_info[w];
+ uint32_t expected = fake_cpuid(wi->cpuid_eax, wi->cpuid_ecx,
+ wi->cpuid_reg);
+ uint32_t actual = cpu->env.features[w];
+ g_assert_cmpint(cpu->filtered_features[w], ==, 0);
+ g_assert_cmpint(actual, ==, expected);
+ }
+ object_unref(OBJECT(cpu));
+
+ /* all-supported test mode: */
+ all_supported = true;
+ cpu = X86_CPU(object_new(object_class_get_name(oc)));
+ x86_cpu_parse_featurestr(CPU(cpu), features2, &error);
+
+ for (w = 0; w < FEATURE_WORDS; w++) {
+ uint32_t expected = ~0;
+ uint32_t actual = cpu->env.features[w];
+ g_assert_cmpint(cpu->filtered_features[w], ==, 0);
+ g_assert_cmpint(actual, ==, expected);
+ }
+ object_unref(OBJECT(cpu));
+
+ /* all-unsupported test mode: */
+ all_supported = false;
+ all_unsupported = true;
+ cpu = X86_CPU(object_new(object_class_get_name(oc)));
+ x86_cpu_parse_featurestr(CPU(cpu), features3, &error);
+
+ for (w = 0; w < FEATURE_WORDS; w++) {
+ uint32_t expected = 0;
+ uint32_t actual = cpu->env.features[w];
+ g_assert_cmpint(cpu->filtered_features[w], ==, 0);
+ g_assert_cmpint(actual, ==, expected);
+ }
+ object_unref(OBJECT(cpu));
+ all_unsupported = false;
+}
+
int main(int argc, char *argv[])
{
module_call_init(MODULE_INIT_QOM);
@@ -86,6 +174,8 @@ int main(int argc, char *argv[])
g_test_add_func("/cpu/x86/creation", test_cpu_creation);
g_test_add_func("/cpu/x86/features/tcg", test_cpu_features_tcg);
+ g_test_add_func("/cpu/x86/features/kvm", test_cpu_features_kvm);
+ g_test_add_func("/cpu/x86/features/host", test_host_cpu_features_kvm);
g_test_run();
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- tests/test-x86-cpu.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)