ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kvm: x86: Pass KVMState to kvm_arch_get_supported_cpuid 

kvm_arch_get_supported_cpuid checks for global cpuid restrictions, it
does not require any CPUState reference. Changing its interface allows
to call it before any VCPU is initialized.

CC: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-06-08 16:11:05 +02:00 committed by Marcelo Tosatti
parent 4bef75b533
commit ba9bc59e1f
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kvm.h
View File

@ -157,7 +157,7 @@ bool kvm_arch_stop_on_emulation_error(CPUState *env);
int kvm_check_extension(KVMState *s, unsigned int extension); int kvm_check_extension(KVMState *s, unsigned int extension);
uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
uint32_t index, int reg); uint32_t index, int reg);
void kvm_cpu_synchronize_state(CPUState *env); void kvm_cpu_synchronize_state(CPUState *env);
void kvm_cpu_synchronize_post_reset(CPUState *env); void kvm_cpu_synchronize_post_reset(CPUState *env);

20
target-i386/cpuid.c
View File

@ -1144,10 +1144,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
break; break;
case 7: case 7:
if (kvm_enabled()) { if (kvm_enabled()) {
*eax = kvm_arch_get_supported_cpuid(env, 0x7, count, R_EAX); KVMState *s = env->kvm_state;
*ebx = kvm_arch_get_supported_cpuid(env, 0x7, count, R_EBX);
*ecx = kvm_arch_get_supported_cpuid(env, 0x7, count, R_ECX); *eax = kvm_arch_get_supported_cpuid(s, 0x7, count, R_EAX);
*edx = kvm_arch_get_supported_cpuid(env, 0x7, count, R_EDX); *ebx = kvm_arch_get_supported_cpuid(s, 0x7, count, R_EBX);
*ecx = kvm_arch_get_supported_cpuid(s, 0x7, count, R_ECX);
*edx = kvm_arch_get_supported_cpuid(s, 0x7, count, R_EDX);
} else { } else {
*eax = 0; *eax = 0;
*ebx = 0; *ebx = 0;
@ -1179,10 +1181,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
break; break;
} }
if (kvm_enabled()) { if (kvm_enabled()) {
*eax = kvm_arch_get_supported_cpuid(env, 0xd, count, R_EAX); KVMState *s = env->kvm_state;
*ebx = kvm_arch_get_supported_cpuid(env, 0xd, count, R_EBX);
*ecx = kvm_arch_get_supported_cpuid(env, 0xd, count, R_ECX); *eax = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EAX);
*edx = kvm_arch_get_supported_cpuid(env, 0xd, count, R_EDX); *ebx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EBX);
*ecx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_ECX);
*edx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EDX);
} else { } else {
*eax = 0; *eax = 0;
*ebx = 0; *ebx = 0;

30
target-i386/kvm.c
View File

@ -98,12 +98,12 @@ struct kvm_para_features {
{ -1, -1 } { -1, -1 }
}; };
static int get_para_features(CPUState *env) static int get_para_features(KVMState *s)
{ {
int i, features = 0; int i, features = 0;
for (i = 0; i < ARRAY_SIZE(para_features) - 1; i++) { for (i = 0; i < ARRAY_SIZE(para_features) - 1; i++) {
if (kvm_check_extension(env->kvm_state, para_features[i].cap)) { if (kvm_check_extension(s, para_features[i].cap)) {
features |= (1 << para_features[i].feature); features |= (1 << para_features[i].feature);
} }
} }
@ -112,7 +112,7 @@ static int get_para_features(CPUState *env)
} }
uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
uint32_t index, int reg) uint32_t index, int reg)
{ {
struct kvm_cpuid2 *cpuid; struct kvm_cpuid2 *cpuid;
@ -122,7 +122,7 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
int has_kvm_features = 0; int has_kvm_features = 0;
max = 1; max = 1;
while ((cpuid = try_get_cpuid(env->kvm_state, max)) == NULL) { while ((cpuid = try_get_cpuid(s, max)) == NULL) {
max *= 2; max *= 2;
} }
@ -153,7 +153,7 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
/* On Intel, kvm returns cpuid according to the Intel spec, /* On Intel, kvm returns cpuid according to the Intel spec,
* so add missing bits according to the AMD spec: * so add missing bits according to the AMD spec:
*/ */
cpuid_1_edx = kvm_arch_get_supported_cpuid(env, 1, 0, R_EDX); cpuid_1_edx = kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
ret |= cpuid_1_edx & 0x183f7ff; ret |= cpuid_1_edx & 0x183f7ff;
break; break;
} }
@ -166,7 +166,7 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
/* fallback for older kernels */ /* fallback for older kernels */
if (!has_kvm_features && (function == KVM_CPUID_FEATURES)) { if (!has_kvm_features && (function == KVM_CPUID_FEATURES)) {
ret = get_para_features(env); ret = get_para_features(s);
} }
return ret; return ret;
@ -349,25 +349,25 @@ int kvm_arch_init_vcpu(CPUState *env)
struct kvm_cpuid2 cpuid; struct kvm_cpuid2 cpuid;
struct kvm_cpuid_entry2 entries[100]; struct kvm_cpuid_entry2 entries[100];
} __attribute__((packed)) cpuid_data; } __attribute__((packed)) cpuid_data;
KVMState *s = env->kvm_state;
uint32_t limit, i, j, cpuid_i; uint32_t limit, i, j, cpuid_i;
uint32_t unused; uint32_t unused;
struct kvm_cpuid_entry2 *c; struct kvm_cpuid_entry2 *c;
uint32_t signature[3]; uint32_t signature[3];
env->cpuid_features &= kvm_arch_get_supported_cpuid(env, 1, 0, R_EDX); env->cpuid_features &= kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
i = env->cpuid_ext_features & CPUID_EXT_HYPERVISOR; i = env->cpuid_ext_features & CPUID_EXT_HYPERVISOR;
env->cpuid_ext_features &= kvm_arch_get_supported_cpuid(env, 1, 0, R_ECX); env->cpuid_ext_features &= kvm_arch_get_supported_cpuid(s, 1, 0, R_ECX);
env->cpuid_ext_features |= i; env->cpuid_ext_features |= i;
env->cpuid_ext2_features &= kvm_arch_get_supported_cpuid(env, 0x80000001, env->cpuid_ext2_features &= kvm_arch_get_supported_cpuid(s, 0x80000001,
0, R_EDX); 0, R_EDX);
env->cpuid_ext3_features &= kvm_arch_get_supported_cpuid(env, 0x80000001, env->cpuid_ext3_features &= kvm_arch_get_supported_cpuid(s, 0x80000001,
0, R_ECX); 0, R_ECX);
env->cpuid_svm_features &= kvm_arch_get_supported_cpuid(env, 0x8000000A, env->cpuid_svm_features &= kvm_arch_get_supported_cpuid(s, 0x8000000A,
0, R_EDX); 0, R_EDX);
cpuid_i = 0; cpuid_i = 0;
/* Paravirtualization CPUIDs */ /* Paravirtualization CPUIDs */
@ -383,8 +383,8 @@ int kvm_arch_init_vcpu(CPUState *env)
c = &cpuid_data.entries[cpuid_i++]; c = &cpuid_data.entries[cpuid_i++];
memset(c, 0, sizeof(*c)); memset(c, 0, sizeof(*c));
c->function = KVM_CPUID_FEATURES; c->function = KVM_CPUID_FEATURES;
c->eax = env->cpuid_kvm_features & kvm_arch_get_supported_cpuid(env, c->eax = env->cpuid_kvm_features &
KVM_CPUID_FEATURES, 0, R_EAX); kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX);
has_msr_async_pf_en = c->eax & (1 << KVM_FEATURE_ASYNC_PF); has_msr_async_pf_en = c->eax & (1 << KVM_FEATURE_ASYNC_PF);
@ -453,7 +453,7 @@ int kvm_arch_init_vcpu(CPUState *env)
/* Call Centaur's CPUID instructions they are supported. */ /* Call Centaur's CPUID instructions they are supported. */
if (env->cpuid_xlevel2 > 0) { if (env->cpuid_xlevel2 > 0) {
env->cpuid_ext4_features &= env->cpuid_ext4_features &=
kvm_arch_get_supported_cpuid(env, 0xC0000001, 0, R_EDX); kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX);
cpu_x86_cpuid(env, 0xC0000000, 0, &limit, &unused, &unused, &unused); cpu_x86_cpuid(env, 0xC0000000, 0, &limit, &unused, &unused, &unused);
for (i = 0xC0000000; i <= limit; i++) { for (i = 0xC0000000; i <= limit; i++) {