diff options
| author | Bandan Das <bsd@redhat.com> | 2018-11-25 23:17:28 -0500 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-11-26 13:00:38 -0200 |
| commit | aec5e9c3a94cf8b7920f59bef69a6f426092c4a0 (patch) | |
| tree | e67c79af04110bb35244efc89dcfad8b32684ab4 /target/i386 | |
| parent | d522fba24478474911b0e6e488b6d1dcf1af54f8 (diff) | |
| download | qemu-aec5e9c3a94cf8b7920f59bef69a6f426092c4a0.zip qemu-aec5e9c3a94cf8b7920f59bef69a6f426092c4a0.tar.gz qemu-aec5e9c3a94cf8b7920f59bef69a6f426092c4a0.tar.bz2 | |
kvm: Use KVM_GET_MSR_INDEX_LIST for MSR_IA32_ARCH_CAPABILITIES support
When writing to guest's MSR_IA32_ARCH_CAPABILITIES, check whether it's
supported in the guest using the KVM_GET_MSR_INDEX_LIST ioctl.
Fixes: d86f963694df27f11b3681ffd225c9362de1b634
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: balducci@units.it
Signed-off-by: Bandan Das <bsd@redhat.com>
Message-Id: <jpg4lc4iiav.fsf_-_@linux.bootlegged.copy>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target/i386')
| -rw-r--r-- | target/i386/kvm.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/target/i386/kvm.c b/target/i386/kvm.c index f524e7d..3d6739a 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -95,6 +95,7 @@ static bool has_msr_xss; static bool has_msr_spec_ctrl; static bool has_msr_virt_ssbd; static bool has_msr_smi_count; +static bool has_msr_arch_capabs; static uint32_t has_architectural_pmu_version; static uint32_t num_architectural_pmu_gp_counters; @@ -1481,6 +1482,9 @@ static int kvm_get_supported_msrs(KVMState *s) case MSR_VIRT_SSBD: has_msr_virt_ssbd = true; break; + case MSR_IA32_ARCH_CAPABILITIES: + has_msr_arch_capabs = true; + break; } } } @@ -2002,14 +2006,9 @@ static int kvm_put_msrs(X86CPU *cpu, int level) #endif /* If host supports feature MSR, write down. */ - if (kvm_feature_msrs) { - int i; - for (i = 0; i < kvm_feature_msrs->nmsrs; i++) - if (kvm_feature_msrs->indices[i] == MSR_IA32_ARCH_CAPABILITIES) { - kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES, - env->features[FEAT_ARCH_CAPABILITIES]); - break; - } + if (has_msr_arch_capabs) { + kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES, + env->features[FEAT_ARCH_CAPABILITIES]); } /* |