common: Make a weak default for arch_crash_hard()

arch_crash_hard() is used from common code, and in the most basic case can
just be an infinite loop.  Both x86 PV and HVM keep their more specific
implementations.

Move the declaration from arch/traps.h to framework.h

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/arch/x86/include/arch/traps.h b/arch/x86/include/arch/traps.h
index 60fc3a4c9772685a994c479b1c0115dfc5943bb5..3e1d52dcb8b2904cfdb13099ff66d0567ac73b41 100644 (file)
--- a/arch/x86/include/arch/traps.h
+++ b/arch/x86/include/arch/traps.h
@@ -14,12 +14,6 @@
  */
 void arch_init_traps(void);
 
-/*
- * Arch-specific function to quiesce the domain, in the event that a
- * shutdown(crash) hypercall has not succeeded.
- */
-void __noreturn arch_crash_hard(void);
-
 /*
  * Return the correct %ss/%esp from an exception.  In 32bit if no stack switch
  * occurs, an exception frame doesn't contain this information.

diff --git a/common/lib.c b/common/lib.c
index acf4da17d2894fbd97635cf341d9052950cbbbf0..58f49656d00f178bac582330a6c3179e0751ef26 100644 (file)
--- a/common/lib.c
+++ b/common/lib.c
@@ -1,3 +1,4 @@
+#include <xtf/framework.h>
 #include <xtf/lib.h>
 #include <xtf/traps.h>
 #include <xtf/hypercall.h>

diff --git a/common/weak-defaults.c b/common/weak-defaults.c
index 74cefebf419fa98f0c302a8508baa4fa033d3874..5aa54689f3589372cfff2929194fbc5a91408967 100644 (file)
--- a/common/weak-defaults.c
+++ b/common/weak-defaults.c
@@ -16,6 +16,14 @@ void __weak test_setup(void)
 {
 }
 
+void __weak __noreturn arch_crash_hard(void)
+{
+    /* panic() has failed.  Sit in a tight loop. */
+    for ( ;; )
+        ;
+    unreachable();
+}
+
 /*
  * Local variables:
  * mode: C

diff --git a/include/xtf/framework.h b/include/xtf/framework.h
index 4c6527e6ef96b0bea498fb039e8875077d13e798..1146a6a5f2f655d830f44178ad61f96ca2c3e340 100644 (file)
--- a/include/xtf/framework.h
+++ b/include/xtf/framework.h
@@ -16,6 +16,12 @@ void arch_setup(void);
 /* Set up test-specific configuration. */
 void test_setup(void);
 
+/*
+ * In the case that normal shutdown actions have failed, contain execution as
+ * best as possible.
+ */
+void __noreturn arch_crash_hard(void);
+
 /* Single line summary of execution environment. */
 extern const char environment_description[];