mirror of https://gitee.com/openkylin/qemu.git
qemu-x86: Set tsc_khz in kvm when supported
Make use of the KVM_TSC_CONTROL feature if available. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
parent
b862d1fe42
commit
e7429073ed
|
@ -354,6 +354,7 @@ int kvm_arch_init_vcpu(CPUState *env)
|
||||||
uint32_t unused;
|
uint32_t unused;
|
||||||
struct kvm_cpuid_entry2 *c;
|
struct kvm_cpuid_entry2 *c;
|
||||||
uint32_t signature[3];
|
uint32_t signature[3];
|
||||||
|
int r;
|
||||||
|
|
||||||
env->cpuid_features &= kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
|
env->cpuid_features &= kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
|
||||||
|
|
||||||
|
@ -499,7 +500,22 @@ int kvm_arch_init_vcpu(CPUState *env)
|
||||||
|
|
||||||
qemu_add_vm_change_state_handler(cpu_update_state, env);
|
qemu_add_vm_change_state_handler(cpu_update_state, env);
|
||||||
|
|
||||||
return kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data);
|
r = kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data);
|
||||||
|
if (r)
|
||||||
|
return r;
|
||||||
|
|
||||||
|
#ifdef KVM_CAP_TSC_CONTROL
|
||||||
|
r = kvm_check_extension(env->kvm_state, KVM_CAP_TSC_CONTROL);
|
||||||
|
if (r && env->tsc_khz) {
|
||||||
|
r = kvm_vcpu_ioctl(env, KVM_SET_TSC_KHZ, env->tsc_khz);
|
||||||
|
if (r < 0) {
|
||||||
|
fprintf(stderr, "KVM_SET_TSC_KHZ failed\n");
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void kvm_arch_reset_vcpu(CPUState *env)
|
void kvm_arch_reset_vcpu(CPUState *env)
|
||||||
|
|
Loading…
Reference in New Issue