Short summary of execution environment

diff --git a/arch/x86/setup.c b/arch/x86/setup.c
index b2bcc24285e43160f82db32273de8f33e1db661d..8aa3825c3c54a01f639dbb1679644d8c03d3561c 100644 (file)
--- a/arch/x86/setup.c
+++ b/arch/x86/setup.c
@@ -7,6 +7,20 @@
 
 uint8_t boot_stack[PAGE_SIZE] __aligned(PAGE_SIZE);
 
+const char *environment_description =
+#if defined(CONFIG_ENV_pv32)
+    "PV 32bit"
+#elif defined(CONFIG_ENV_pv64)
+    "PV 64bit"
+#elif defined(CONFIG_ENV_hvm32)
+    "HVM 32bit"
+#elif defined(CONFIG_ENV_hvm64)
+    "HVM 64bit"
+#else
+# error Bad Environment
+#endif
+    ;
+
 #ifdef CONFIG_ENV_pv
 /* Filled in by head_pv.S */
 start_info_t *start_info = NULL;

diff --git a/common/setup.c b/common/setup.c
index 1c120a13428ce4234882617c2e7f1f20daf7ec6e..c0ef3698d4f783bbe18a4468ac9003fce5b4631c 100644 (file)
--- a/common/setup.c
+++ b/common/setup.c
@@ -22,6 +22,7 @@ void __noreturn xtf_main(void)
     arch_setup();
 
     printk("--- Xen Test Framework ---\n");
+    printk("Environment: %s\n", environment_description);
 
     test_main();
 

diff --git a/include/xtf/framework.h b/include/xtf/framework.h
index cb81ae9e21cf4e1c3d698d73ec6fa67f0e78085d..afac05082a759674a205b101f0e831a66019cd5c 100644 (file)
--- a/include/xtf/framework.h
+++ b/include/xtf/framework.h
@@ -4,6 +4,9 @@
 /* To be implemented by each arch */
 void arch_setup(void);
 
+/* Single line summary of execution environment. */
+extern const char *environment_description;
+
 #endif /* XTF_FRAMEWORK_H */
 
 /*