Commit 457dfed6 authored by Andre Przywara's avatar Andre Przywara Committed by Aurelien Jarno
Browse files

x86/cpuid: remove unnecessary kvm_trim function



Correct me if I am wrong, but kvm_trim looks like a really bloated
implementation of a bitwise AND. So remove this function and replace
it with the real stuff(TM).
Signed-off-by: default avatarAndre Przywara <andre.przywara@amd.com>
Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>
parent ed2c54d4
...@@ -133,19 +133,6 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, int reg) ...@@ -133,19 +133,6 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, int reg)
#endif #endif
static void kvm_trim_features(uint32_t *features, uint32_t supported)
{
int i;
uint32_t mask;
for (i = 0; i < 32; ++i) {
mask = 1U << i;
if ((*features & mask) && !(supported & mask)) {
*features &= ~mask;
}
}
}
#ifdef CONFIG_KVM_PARA #ifdef CONFIG_KVM_PARA
struct kvm_para_features { struct kvm_para_features {
int cap; int cap;
...@@ -191,18 +178,16 @@ int kvm_arch_init_vcpu(CPUState *env) ...@@ -191,18 +178,16 @@ int kvm_arch_init_vcpu(CPUState *env)
env->mp_state = KVM_MP_STATE_RUNNABLE; env->mp_state = KVM_MP_STATE_RUNNABLE;
kvm_trim_features(&env->cpuid_features, env->cpuid_features &= kvm_arch_get_supported_cpuid(env, 1, R_EDX);
kvm_arch_get_supported_cpuid(env, 1, R_EDX));
i = env->cpuid_ext_features & CPUID_EXT_HYPERVISOR; i = env->cpuid_ext_features & CPUID_EXT_HYPERVISOR;
kvm_trim_features(&env->cpuid_ext_features, env->cpuid_ext_features &= kvm_arch_get_supported_cpuid(env, 1, R_ECX);
kvm_arch_get_supported_cpuid(env, 1, R_ECX));
env->cpuid_ext_features |= i; env->cpuid_ext_features |= i;
kvm_trim_features(&env->cpuid_ext2_features, env->cpuid_ext2_features &= kvm_arch_get_supported_cpuid(env, 0x80000001,
kvm_arch_get_supported_cpuid(env, 0x80000001, R_EDX)); R_EDX);
kvm_trim_features(&env->cpuid_ext3_features, env->cpuid_ext3_features &= kvm_arch_get_supported_cpuid(env, 0x80000001,
kvm_arch_get_supported_cpuid(env, 0x80000001, R_ECX)); R_ECX);
cpuid_i = 0; cpuid_i = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment