]> xenbits.xensource.com Git - people/liuw/xen.git/commitdiff
x86/msr: Fix 'plaform' typo
authorAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 12 Sep 2019 09:57:37 +0000 (10:57 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 12 Sep 2019 10:37:23 +0000 (11:37 +0100)
Reported-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
xen/arch/x86/cpu/common.c
xen/arch/x86/msr.c
xen/include/xen/lib/x86/msr.h
xen/lib/x86/msr.c

index 8de4a44c1a04f3fc9e57c34c7ed91e5dd907c65b..937d8e82a89e06701bffb8958a256da263779825 100644 (file)
@@ -124,7 +124,7 @@ bool __init probe_cpuid_faulting(void)
                return false;
 
        if ((rc = rdmsr_safe(MSR_INTEL_PLATFORM_INFO, val)) == 0)
-               raw_msr_policy.plaform_info.cpuid_faulting =
+               raw_msr_policy.platform_info.cpuid_faulting =
                        val & MSR_PLATFORM_INFO_CPUID_FAULTING;
 
        if (rc ||
index 5a2ef7884968a483e3705e0a562d2d5840793c4d..e65961fccb00739d6bf860615bf9c32db0c6febc 100644 (file)
@@ -51,7 +51,7 @@ static void __init calculate_host_policy(void)
 
     /* 0x000000ce  MSR_INTEL_PLATFORM_INFO */
     /* probe_cpuid_faulting() sanity checks presence of MISC_FEATURES_ENABLES */
-    mp->plaform_info.cpuid_faulting = cpu_has_cpuid_faulting;
+    mp->platform_info.cpuid_faulting = cpu_has_cpuid_faulting;
 }
 
 static void __init calculate_hvm_max_policy(void)
@@ -64,7 +64,7 @@ static void __init calculate_hvm_max_policy(void)
     *mp = host_msr_policy;
 
     /* It's always possible to emulate CPUID faulting for HVM guests */
-    mp->plaform_info.cpuid_faulting = true;
+    mp->platform_info.cpuid_faulting = true;
 }
 
 static void __init calculate_pv_max_policy(void)
@@ -93,7 +93,7 @@ int init_domain_msr_policy(struct domain *d)
 
     /* See comment in intel_ctxt_switch_levelling() */
     if ( is_control_domain(d) )
-        mp->plaform_info.cpuid_faulting = false;
+        mp->platform_info.cpuid_faulting = false;
 
     d->arch.msr = mp;
 
@@ -165,7 +165,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val)
         break;
 
     case MSR_INTEL_PLATFORM_INFO:
-        *val = mp->plaform_info.raw;
+        *val = mp->platform_info.raw;
         break;
 
     case MSR_ARCH_CAPABILITIES:
@@ -358,7 +358,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val)
         bool old_cpuid_faulting = msrs->misc_features_enables.cpuid_faulting;
 
         rsvd = ~0ull;
-        if ( mp->plaform_info.cpuid_faulting )
+        if ( mp->platform_info.cpuid_faulting )
             rsvd &= ~MSR_MISC_FEATURES_CPUID_FAULTING;
 
         if ( val & rsvd )
index 6236622adf6387e3b395bb042102bb6daf9c3237..e83a8fbb0fb3a7c7344a6604860e6b04b9aad87c 100644 (file)
@@ -22,7 +22,7 @@ struct msr_policy
             uint32_t :31;
             bool cpuid_faulting:1;
         };
-    } plaform_info;
+    } platform_info;
 };
 
 #ifdef __XEN__
index 7c92f0dd9e615c3facca4b3aedd9744c3a2d6aa7..256b5ec632d177535b4b85b62091e7dafa133cc6 100644 (file)
@@ -38,7 +38,7 @@ int x86_msr_copy_to_buffer(const struct msr_policy *p,
             return ret;                                         \
     })
 
-    COPY_MSR(MSR_INTEL_PLATFORM_INFO, p->plaform_info.raw);
+    COPY_MSR(MSR_INTEL_PLATFORM_INFO, p->platform_info.raw);
 
 #undef COPY_MSR
 
@@ -95,7 +95,7 @@ int x86_msr_copy_from_buffer(struct msr_policy *p,
     p->field = data.val;                          \
 })
 
-        case MSR_INTEL_PLATFORM_INFO: ASSIGN(plaform_info.raw); break;
+        case MSR_INTEL_PLATFORM_INFO: ASSIGN(platform_info.raw); break;
 
 #undef ASSIGN