From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya8Ag-0005HW-9W for qemu-devel@nongnu.org; Mon, 23 Mar 2015 15:37:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ya8Aa-0003UJ-Af for qemu-devel@nongnu.org; Mon, 23 Mar 2015 15:37:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya8Aa-0003UF-3p for qemu-devel@nongnu.org; Mon, 23 Mar 2015 15:37:52 -0400 From: Eduardo Habkost Date: Mon, 23 Mar 2015 16:37:11 -0300 Message-Id: <1427139432-27530-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1427139432-27530-1-git-send-email-ehabkost@redhat.com> References: <1427139432-27530-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-2.4 v5 6/7] tests: test-x86-cpu: Add KVM feature bit initialization test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Igor Mammedov Signed-off-by: Eduardo Habkost --- tests/test-x86-cpu.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/tests/test-x86-cpu.c b/tests/test-x86-cpu.c index a0923e7..b1b04ea 100644 --- a/tests/test-x86-cpu.c +++ b/tests/test-x86-cpu.c @@ -78,6 +78,88 @@ 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; + 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_abort); + + 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]; + g_assert_cmpint(actual, ==, expected); + } + object_unref(OBJECT(cpu)); + } +} + +static void test_host_cpu_features_kvm(void) +{ + FeatureWord w; + ObjectClass *oc; + X86CPU *cpu; + 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: */ + use_fake_cpuid = true; + cpu = X86_CPU(object_new(object_class_get_name(oc))); + x86_cpu_parse_featurestr(CPU(cpu), features1, &error_abort); + + 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: */ + use_fake_cpuid = false; + cpu = X86_CPU(object_new(object_class_get_name(oc))); + x86_cpu_parse_featurestr(CPU(cpu), features2, &error_abort); + + 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_unsupported = true; + cpu = X86_CPU(object_new(object_class_get_name(oc))); + x86_cpu_parse_featurestr(CPU(cpu), features3, &error_abort); + + 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 +168,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(); -- 2.1.0