diff options
| author | Andrey Smetanin <asmetanin@virtuozzo.com> | 2015-09-16 12:59:43 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-12 18:29:26 +0200 |
| commit | 8c145d7ca9b4267d2ec1eabe801c6b2aee636f1f (patch) | |
| tree | 6801e7c3df9b34007d6dcdc54ae37ac1a1ffe15f /target-i386/kvm.c | |
| parent | 744b8a9440fa2bd78ae64861667337439e25a6dc (diff) | |
| download | qemu-8c145d7ca9b4267d2ec1eabe801c6b2aee636f1f.tar.gz | |
target-i386/kvm: set Hyper-V features cpuid bit HV_X64_MSR_VP_INDEX_AVAILABLE
Hyper-V features bit HV_X64_MSR_VP_INDEX_AVAILABLE value is
based on cpu option "hv-vpindex" and kernel support of
HV_X64_MSR_VP_INDEX.
Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Richard Henderson <rth@twiddle.net>
CC: Eduardo Habkost <ehabkost@redhat.com>
CC: "Andreas Färber" <afaerber@suse.de>
CC: Marcelo Tosatti <mtosatti@redhat.com>
Message-Id: <1442397584-16698-3-git-send-email-den@openvz.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-i386/kvm.c')
| -rw-r--r-- | target-i386/kvm.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 401a2f3c3f..4d5ff9a253 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -83,6 +83,7 @@ static bool has_msr_hv_vapic; static bool has_msr_hv_tsc; static bool has_msr_hv_crash; static bool has_msr_hv_reset; +static bool has_msr_hv_vpindex; static bool has_msr_mtrr; static bool has_msr_xss; @@ -462,7 +463,8 @@ static bool hyperv_enabled(X86CPU *cpu) cpu->hyperv_time || cpu->hyperv_relaxed_timing || cpu->hyperv_crash || - cpu->hyperv_reset); + cpu->hyperv_reset || + cpu->hyperv_vpindex); } static Error *invtsc_mig_blocker; @@ -534,6 +536,9 @@ int kvm_arch_init_vcpu(CPUState *cs) if (cpu->hyperv_reset && has_msr_hv_reset) { c->eax |= HV_X64_MSR_RESET_AVAILABLE; } + if (cpu->hyperv_vpindex && has_msr_hv_vpindex) { + c->eax |= HV_X64_MSR_VP_INDEX_AVAILABLE; + } c = &cpuid_data.entries[cpuid_i++]; c->function = HYPERV_CPUID_ENLIGHTMENT_INFO; if (cpu->hyperv_relaxed_timing) { @@ -866,6 +871,10 @@ static int kvm_get_supported_msrs(KVMState *s) has_msr_hv_reset = true; continue; } + if (kvm_msr_list->indices[i] == HV_X64_MSR_VP_INDEX) { + has_msr_hv_vpindex = true; + continue; + } } } |