[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/15] i386: kvm: mask cpuid_kvm_features earlier
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 11/15] i386: kvm: mask cpuid_kvm_features earlier |
Date: |
Thu, 4 Oct 2012 17:49:03 -0300 |
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>
---
target-i386/kvm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 590f4d5..3f4bee5 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.11.4
- [Qemu-devel] [PATCH 00/15] QEMU KVM_GET_SUPPORTED_CPUID cleanups and fixes, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 01/15] i386: kvm: kvm_arch_get_supported_cpuid: move R_EDX hack outside of for loop, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 06/15] i386: kvm: extract try_get_cpuid() loop to get_supported_cpuid() function, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 11/15] i386: kvm: mask cpuid_kvm_features earlier,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 07/15] i386: kvm: kvm_arch_get_supported_cpuid: replace if+switch with single 'if', Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 10/15] i386: kvm: x2apic is not supported without in-kernel irqchip, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 08/15] i386: kvm: set CPUID_EXT_HYPERVISOR on kvm_arch_get_supported_cpuid(), Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 14/15] i386: kvm: reformat filter_features_for_kvm() code, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 04/15] i386: kvm: extract register switch to cpuid_entry_get_reg() function, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 02/15] i386: kvm: kvm_arch_get_supported_cpuid: clean up has_kvm_features check, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 15/15] i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 13/15] i386: kvm: filter CPUID feature words earlier, on cpu.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 12/15] i386: kvm: mask cpuid_ext4_features bits earlier, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 05/15] i386: kvm: extract CPUID entry lookup to cpuid_find_entry() function, Eduardo Habkost, 2012/10/04