File tree Expand file tree Collapse file tree 1 file changed +15
-3
lines changed Expand file tree Collapse file tree 1 file changed +15
-3
lines changed Original file line number Diff line number Diff line change @@ -1059,13 +1059,25 @@ static u32 msr_based_features[] = {
1059
1059
1060
1060
static unsigned int num_msr_based_features;
1061
1061
1062
+ static int kvm_get_msr_feature(struct kvm_msr_entry *msr)
1063
+ {
1064
+ switch (msr->index) {
1065
+ default:
1066
+ if (kvm_x86_ops->get_msr_feature(msr))
1067
+ return 1;
1068
+ }
1069
+ return 0;
1070
+ }
1071
+
1062
1072
static int do_get_msr_feature(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
1063
1073
{
1064
1074
struct kvm_msr_entry msr;
1075
+ int r;
1065
1076
1066
1077
msr.index = index;
1067
- if (kvm_x86_ops->get_msr_feature(&msr))
1068
- return 1;
1078
+ r = kvm_get_msr_feature(&msr);
1079
+ if (r)
1080
+ return r;
1069
1081
1070
1082
*data = msr.data;
1071
1083
@@ -4522,7 +4534,7 @@ static void kvm_init_msr_list(void)
4522
4534
struct kvm_msr_entry msr;
4523
4535
4524
4536
msr.index = msr_based_features[i];
4525
- if (kvm_x86_ops->get_msr_feature (&msr))
4537
+ if (kvm_get_msr_feature (&msr))
4526
4538
continue;
4527
4539
4528
4540
if (j < i)
You can’t perform that action at this time.
0 commit comments