Commit 4bb95b82 authored by Ladi Prosek's avatar Ladi Prosek Committed by Paolo Bonzini
Browse files

i386/kvm: introduce tsc_is_stable_and_known() 



Move the "is TSC stable and known" condition to a reusable helper.

Signed-off-by: default avatarLadi Prosek <lprosek@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170807085703.32267-4-lprosek@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ddb98b5a

target/i386/kvm.c

+10 −3
Original line number Diff line number Diff line
@@ -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;