diff options
| author | Ladi Prosek | 2017-08-07 10:57:02 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2017-09-19 14:09:33 +0200 |
| commit | 4bb95b82df7ea4a1c7de15649dd16a70a19e6bab (patch) | |
| tree | a3707a7c9368605595106dc881cad534178d1f1b /target/i386/kvm.c | |
| parent | i386/kvm: set tsc_khz before configuring Hyper-V CPUID (diff) | |
| download | qemu-4bb95b82df7ea4a1c7de15649dd16a70a19e6bab.tar.gz qemu-4bb95b82df7ea4a1c7de15649dd16a70a19e6bab.tar.xz qemu-4bb95b82df7ea4a1c7de15649dd16a70a19e6bab.zip | |
i386/kvm: introduce tsc_is_stable_and_known()
Move the "is TSC stable and known" condition to a reusable helper.
Signed-off-by: Ladi Prosek <lprosek@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170807085703.32267-4-lprosek@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target/i386/kvm.c')
| -rw-r--r-- | target/i386/kvm.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 15d56ae3f8..2dc01c9973 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -611,6 +611,15 @@ static int kvm_arch_set_tsc_khz(CPUState *cs) return 0; } +static bool tsc_is_stable_and_known(CPUX86State *env) +{ + if (!env->tsc_khz) { + return false; + } + return (env->features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC) + || env->user_tsc_khz; +} + static int hyperv_handle_properties(CPUState *cs) { X86CPU *cpu = X86_CPU(cs); @@ -986,9 +995,7 @@ int kvm_arch_init_vcpu(CPUState *cs) && cpu->expose_kvm && kvm_base == KVM_CPUID_SIGNATURE /* TSC clock must be stable and known for this feature. */ - && ((env->features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC) - || env->user_tsc_khz != 0) - && env->tsc_khz != 0) { + && tsc_is_stable_and_known(env)) { c = &cpuid_data.entries[cpuid_i++]; c->function = KVM_CPUID_SIGNATURE | 0x10; |