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

i386/kvm: set tsc_khz before configuring Hyper-V CPUID 



Timing-related Hyper-V enlightenments will benefit from knowing the final
tsc_khz value. This commit just moves the code in preparation for further
changes.

Signed-off-by: default avatarLadi Prosek <lprosek@redhat.com>
Message-Id: <20170807085703.32267-3-lprosek@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1d268dec

target/i386/kvm.c

+19 −19
Original line number Diff line number Diff line
@@ -695,6 +695,25 @@ int kvm_arch_init_vcpu(CPUState *cs) 


    cpuid_i = 0;



    r = kvm_arch_set_tsc_khz(cs);

    if (r < 0) {

        goto fail;

    }



    /* vcpu's TSC frequency is either specified by user, or following

     * the value used by KVM if the former is not present. In the

     * latter case, we query it from KVM and record in env->tsc_khz,

     * so that vcpu's TSC frequency can be migrated later via this field.

     */

    if (!env->tsc_khz) {

        r = kvm_check_extension(cs->kvm_state, KVM_CAP_GET_TSC_KHZ) ?

            kvm_vcpu_ioctl(cs, KVM_GET_TSC_KHZ) :

            -ENOTSUP;

        if (r > 0) {

            env->tsc_khz = r;

        }

    }



    /* Paravirtualization CPUIDs */

    if (hyperv_enabled(cpu)) {

        c = &cpuid_data.entries[cpuid_i++];
@@ -961,25 +980,6 @@ int kvm_arch_init_vcpu(CPUState *cs) 
        }

    }



    r = kvm_arch_set_tsc_khz(cs);

    if (r < 0) {

        goto fail;

    }



    /* vcpu's TSC frequency is either specified by user, or following

     * the value used by KVM if the former is not present. In the

     * latter case, we query it from KVM and record in env->tsc_khz,

     * so that vcpu's TSC frequency can be migrated later via this field.

     */

    if (!env->tsc_khz) {

        r = kvm_check_extension(cs->kvm_state, KVM_CAP_GET_TSC_KHZ) ?

            kvm_vcpu_ioctl(cs, KVM_GET_TSC_KHZ) :

            -ENOTSUP;

        if (r > 0) {

            env->tsc_khz = r;

        }

    }



    if (cpu->vmware_cpuid_freq

        /* Guests depend on 0x40000000 to detect this feature, so only expose

         * it if KVM exposes leaf 0x40000000. (Conflicts with Hyper-V) */