[Xen-devel] [PATCH 06/19] x86/mce: merge intel_default_mce_dhandler/uhandler()

[Haozhong Zhang <haozhong.zhang@xxxxxxxxx>]

Implementations of these two functions are effectively the same, so
unify them by a common intel_default_mce_handler().

Signed-off-by: Haozhong Zhang <haozhong.zhang@xxxxxxxxx>
---
Cc: Christoph Egger <chegger@xxxxxxxxx>
Cc: Liu Jinsong <jinsong.liu@xxxxxxxxxxxxxxx>
Cc: Jan Beulich <jbeulich@xxxxxxxx>
Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/cpu/mcheck/mce_intel.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c 
b/xen/arch/x86/cpu/mcheck/mce_intel.c
index 498e8e4..b5ee8b8 100644
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c
@@ -342,7 +342,7 @@ static int intel_default_check(uint64_t status)
     return 1;
 }
 
-static void intel_default_mce_dhandler(
+static void intel_default_mce_handler(
              struct mca_binfo *binfo,
              enum mce_result *result,
              const struct cpu_user_regs * regs)
@@ -361,32 +361,11 @@ static void intel_default_mce_dhandler(
 static const struct mca_error_handler intel_mce_dhandlers[] = {
     {intel_srao_check, intel_srao_dhandler},
     {intel_srar_check, intel_srar_dhandler},
-    {intel_default_check, intel_default_mce_dhandler}
+    {intel_default_check, intel_default_mce_handler}
 };
 
-static void intel_default_mce_uhandler(
-             struct mca_binfo *binfo,
-             enum mce_result *result,
-             const struct cpu_user_regs *regs)
-{
-    uint64_t status = binfo->mib->mc_status;
-    enum intel_mce_type type;
-
-    type = intel_check_mce_type(status);
-
-    switch (type)
-    {
-    case intel_mce_fatal:
-        *result = MCER_RESET;
-        break;
-    default:
-        *result = MCER_CONTINUE;
-        break;
-    }
-}
-
 static const struct mca_error_handler intel_mce_uhandlers[] = {
-    {intel_default_check, intel_default_mce_uhandler}
+    {intel_default_check, intel_default_mce_handler}
 };
 
 /* According to MCA OS writer guide, CMCI handler need to clear bank when
-- 
2.10.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel