Commit 9445597b authored by Roman Kagan's avatar Roman Kagan Committed by Paolo Bonzini
Browse files

i386/hyperv: add hv-frequencies cpu property 



In order to guarantee compatibility on migration, QEMU should have
complete control over the features it announces to the guest via CPUID.

However, the availability of Hyper-V frequency MSRs
(HV_X64_MSR_TSC_FREQUENCY and HV_X64_MSR_APIC_FREQUENCY) depends solely
on the support for them in the underlying KVM.

Introduce "hv-frequencies" cpu property (off by default) which gives
QEMU full control over whether these MSRs are announced.

While at this, drop the redundant check of the cpu tsc frequency, and
decouple this feature from hv-time.

Signed-off-by: default avatarRoman Kagan <rkagan@virtuozzo.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180330170209.20627-2-rkagan@virtuozzo.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7becac84

target/i386/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -4761,6 +4761,7 @@ static Property x86_cpu_properties[] = { 
    DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false),

    DEFINE_PROP_BOOL("hv-synic", X86CPU, hyperv_synic, false),

    DEFINE_PROP_BOOL("hv-stimer", X86CPU, hyperv_stimer, false),

    DEFINE_PROP_BOOL("hv-frequencies", X86CPU, hyperv_frequencies, false),

    DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true),

    DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false),

    DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true),

target/i386/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ struct X86CPU { 
    bool hyperv_runtime;

    bool hyperv_synic;

    bool hyperv_stimer;

    bool hyperv_frequencies;

    bool check_cpuid;

    bool enforce_cpuid;

    bool expose_kvm;

target/i386/kvm.c

+9 −4
Original line number Diff line number Diff line
@@ -648,12 +648,17 @@ static int hyperv_handle_properties(CPUState *cs) 
        env->features[FEAT_HYPERV_EAX] |= HV_HYPERCALL_AVAILABLE;

        env->features[FEAT_HYPERV_EAX] |= HV_TIME_REF_COUNT_AVAILABLE;

        env->features[FEAT_HYPERV_EAX] |= HV_REFERENCE_TSC_AVAILABLE;



        if (has_msr_hv_frequencies && tsc_is_stable_and_known(env)) {

    }

    if (cpu->hyperv_frequencies) {

        if (!has_msr_hv_frequencies) {

            fprintf(stderr, "Hyper-V frequency MSRs "

                    "(requested by 'hv-frequencies' cpu flag) "

                    "are not supported by kernel\n");

            return -ENOSYS;

        }

        env->features[FEAT_HYPERV_EAX] |= HV_ACCESS_FREQUENCY_MSRS;

        env->features[FEAT_HYPERV_EDX] |= HV_FREQUENCY_MSRS_AVAILABLE;

    }

    }

    if (cpu->hyperv_crash && has_msr_hv_crash) {

        env->features[FEAT_HYPERV_EDX] |= HV_GUEST_CRASH_MSR_AVAILABLE;

    }