Introduce xtf_exit()

This is more convenient for tests which want to terminate cleanly from the
middle of their logic, rather than needing to arrange for execution to return
from test_main().

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

diff --git a/common/report.c b/common/report.c
index 8a6ddfa6d836a7a699497480b18d1075a82859c0..ffdf09871eb1652b454627d4c4eaa72800732140 100644 (file)
--- a/common/report.c
+++ b/common/report.c
@@ -1,6 +1,6 @@
-#include <xtf/types.h>
+#include <xtf/lib.h>
 #include <xtf/report.h>
-#include <xtf/console.h>
+#include <xtf/hypercall.h>
 
 enum test_status {
     STATUS_RUNNING, /**< Test not yet completed.       */
@@ -121,6 +121,13 @@ bool xtf_status_reported(void)
     return status != STATUS_RUNNING;
 }
 
+void xtf_exit(void)
+{
+    xtf_report_status();
+    hypercall_shutdown(SHUTDOWN_poweroff);
+    panic("xtf_exit(): hypercall_shutdown(SHUTDOWN_poweroff) returned\n");
+}
+
 /*
  * Local variables:
  * mode: C

diff --git a/common/setup.c b/common/setup.c
index 9d70435c59026e79ba60e4d74dc1afef3bd9aafd..932fc09168da981773d6aa4e38004a2e6d93846a 100644 (file)
--- a/common/setup.c
+++ b/common/setup.c
@@ -32,10 +32,8 @@ void __noreturn xtf_main(void)
         test_main();
     }
 
-    xtf_report_status();
-
-    hypercall_shutdown(SHUTDOWN_poweroff);
-    unreachable();
+    /* Report status and exit. */
+    xtf_exit();
 }
 
 /*

diff --git a/include/xtf/report.h b/include/xtf/report.h
index 9a59d6f486521e5d72dea1ddc93784badd2b8ab2..36517bdea9755be60e03789613e94e3caeb11734 100644 (file)
--- a/include/xtf/report.h
+++ b/include/xtf/report.h
@@ -73,6 +73,13 @@ void xtf_report_status(void);
  */
 bool xtf_status_reported(void);
 
+/**
+ * Exit the test early.
+ *
+ * Reports the current status.  Does not return.
+ */
+void __noreturn xtf_exit(void);
+
 #endif /* XTF_REPORT_H */
 
 /*