[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/28] i386: kvm: mask cpuid_kvm_features earlier
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 11/28] i386: kvm: mask cpuid_kvm_features earlier |
Date: |
Wed, 31 Oct 2012 07:39:49 -0200 |
From: Eduardo Habkost <address@hidden>
Instead of masking the KVM feature bits very late (while building the
KVM_SET_CPUID2 data), mask it out on env->cpuid_kvm_features, at the
same point where the other feature words are masked out.
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 4e96b04..8eb61a0 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -428,6 +428,9 @@ int kvm_arch_init_vcpu(CPUX86State *env)
env->cpuid_svm_features &= kvm_arch_get_supported_cpuid(s, 0x8000000A,
0, R_EDX);
+ env->cpuid_kvm_features &=
+ kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX);
+
cpuid_i = 0;
/* Paravirtualization CPUIDs */
@@ -448,8 +451,7 @@ int kvm_arch_init_vcpu(CPUX86State *env)
c = &cpuid_data.entries[cpuid_i++];
memset(c, 0, sizeof(*c));
c->function = KVM_CPUID_FEATURES;
- c->eax = env->cpuid_kvm_features &
- kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX);
+ c->eax = env->cpuid_kvm_features;
if (hyperv_enabled()) {
memcpy(signature, "Hv#1\0\0\0\0\0\0\0\0", 12);
--
1.7.6.4
- [Qemu-devel] [PATCH 14/28] i386: kvm: reformat filter_features_for_kvm() code, (continued)
- [Qemu-devel] [PATCH 14/28] i386: kvm: reformat filter_features_for_kvm() code, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 04/28] i386: kvm: extract register switch to cpuid_entry_get_reg() function, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 26/28] target-i386: cpu: make -cpu host/check/enforce code KVM-specific, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 17/28] target-i386: Add missing kvm cpuid feature name, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 15/28] i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 23/28] Issue warning when deprecated -tdf option is used, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 08/28] i386: kvm: set CPUID_EXT_HYPERVISOR on kvm_arch_get_supported_cpuid(), Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 09/28] i386: kvm: set CPUID_EXT_TSC_DEADLINE_TIMER on kvm_arch_get_supported_cpuid(), Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 13/28] i386: kvm: filter CPUID feature words earlier, on cpu.c, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 03/28] i386: kvm: kvm_arch_get_supported_cpuid: use 'entry' variable, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 11/28] i386: kvm: mask cpuid_kvm_features earlier,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 01/28] i386: kvm: kvm_arch_get_supported_cpuid: move R_EDX hack outside of for loop, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 18/28] cirrus_vga: allow configurable vram size, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 21/28] Use global properties to emulate -no-kvm-pit-reinjection, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 10/28] i386: kvm: x2apic is not supported without in-kernel irqchip, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 24/28] Emulate qemu-kvms -no-kvm option, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 16/28] i386: cpu: add missing CPUID[EAX=7, ECX=0] flag names, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 02/28] i386: kvm: kvm_arch_get_supported_cpuid: clean up has_kvm_features check, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 22/28] Issue warning when deprecated drive parameter boot=on|off is used, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 20/28] Issue warning when deprecated -no-kvm-pit is used, Marcelo Tosatti, 2012/10/31
- [Qemu-devel] [PATCH 07/28] i386: kvm: kvm_arch_get_supported_cpuid: replace if+switch with single 'if', Marcelo Tosatti, 2012/10/31