aboutsummaryrefslogtreecommitdiffstats
path: root/xen/include/asm-x86/traps.h
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-07-15 16:21:12 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-07-15 16:21:12 +0100
commitb84689836af8e9101c1b579180ef0bcb6a42ba98 (patch)
treefb6c9569bf09f834ad29b4049abca13c206368ed /xen/include/asm-x86/traps.h
parent0afa130b1f1d18bfc62b985de9132bfa427448c1 (diff)
downloadxen-b84689836af8e9101c1b579180ef0bcb6a42ba98.tar.gz
xen-b84689836af8e9101c1b579180ef0bcb6a42ba98.tar.bz2
xen-b84689836af8e9101c1b579180ef0bcb6a42ba98.zip
x86: extend some of Intel's recent MCE work to also support AMD
At least the MSR handling for guests can easily be made shared between the two vendors; likely a lot of the other code in mce_intel.c could also be made common. The goal here, however, is to eliminate the annoying guest-tried-to-modify-msr messages that result from enabling the MCE code on the Linux side. Additionally (in order for not having to make the same change twice to basically identical code) the patch also merges amd_{fam10,k8}_mcheck_init(), enables the former to also be used for Fam11 (I'd suppose that Fam12 would also need to go here, but I have no data to confirm that), and does some minor (mostly coding style for the code moved around) adjustments. Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/include/asm-x86/traps.h')
-rw-r--r--xen/include/asm-x86/traps.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/xen/include/asm-x86/traps.h b/xen/include/asm-x86/traps.h
index c2a0982c04..780de94a9a 100644
--- a/xen/include/asm-x86/traps.h
+++ b/xen/include/asm-x86/traps.h
@@ -47,9 +47,9 @@ extern int guest_has_trap_callback(struct domain *d, uint16_t vcpuid,
extern int send_guest_trap(struct domain *d, uint16_t vcpuid,
unsigned int trap_nr);
-/* Intel vMCE MSRs virtualization */
-extern void intel_mce_init_msr(struct domain *d);
-extern int intel_mce_wrmsr(u32 msr, u64 value);
-extern int intel_mce_rdmsr(u32 msr, u32 *lo, u32 *hi);
+/* Guest vMCE MSRs virtualization */
+extern void mce_init_msr(struct domain *d);
+extern int mce_wrmsr(u32 msr, u64 value);
+extern int mce_rdmsr(u32 msr, u32 *lo, u32 *hi);
#endif /* ASM_TRAP_H */