| From foo@baz Tue Aug 14 16:14:56 CEST 2018 |
| From: Wanpeng Li <wanpengli@tencent.com> |
| Date: Wed, 28 Feb 2018 14:03:30 +0800 |
| Subject: KVM: X86: Introduce kvm_get_msr_feature() |
| |
| From: Wanpeng Li <wanpengli@tencent.com> |
| |
| commit 66421c1ec340096b291af763ed5721314cdd9c5c upstream |
| |
| Introduce kvm_get_msr_feature() to handle the msrs which are supported |
| by different vendors and sharing the same emulation logic. |
| |
| Signed-off-by: Wanpeng Li <wanpengli@tencent.com> |
| Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> |
| Cc: Liran Alon <liran.alon@oracle.com> |
| Cc: Nadav Amit <nadav.amit@gmail.com> |
| Cc: Borislav Petkov <bp@alien8.de> |
| Cc: Tom Lendacky <thomas.lendacky@amd.com> |
| Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/kvm/x86.c | 18 +++++++++++++++--- |
| 1 file changed, 15 insertions(+), 3 deletions(-) |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -1018,13 +1018,25 @@ static u32 msr_based_features[] = { |
| |
| static unsigned int num_msr_based_features; |
| |
| +static int kvm_get_msr_feature(struct kvm_msr_entry *msr) |
| +{ |
| + switch (msr->index) { |
| + default: |
| + if (kvm_x86_ops->get_msr_feature(msr)) |
| + return 1; |
| + } |
| + return 0; |
| +} |
| + |
| static int do_get_msr_feature(struct kvm_vcpu *vcpu, unsigned index, u64 *data) |
| { |
| struct kvm_msr_entry msr; |
| + int r; |
| |
| msr.index = index; |
| - if (kvm_x86_ops->get_msr_feature(&msr)) |
| - return 1; |
| + r = kvm_get_msr_feature(&msr); |
| + if (r) |
| + return r; |
| |
| *data = msr.data; |
| |
| @@ -4295,7 +4307,7 @@ static void kvm_init_msr_list(void) |
| struct kvm_msr_entry msr; |
| |
| msr.index = msr_based_features[i]; |
| - if (kvm_x86_ops->get_msr_feature(&msr)) |
| + if (kvm_get_msr_feature(&msr)) |
| continue; |
| |
| if (j < i) |