From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 21 Feb 2017 15:03:53 +0000 (+0000)
Subject: Declare environment_description as an array
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f3cbcfed8a591b5fd9ec99bb7252785e2235179d;p=people%2Fandrewcoop%2Fxen-test-framework.git

Declare environment_description as an array

There is no point following a pointer into the string section when a direct
reference will do.

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

diff --git a/arch/x86/setup.c b/arch/x86/setup.c
index 3e79226..5dbc919 100644
--- a/arch/x86/setup.c
+++ b/arch/x86/setup.c
@@ -22,7 +22,7 @@ enum x86_vendor x86_vendor;
 unsigned int x86_family, x86_model, x86_stepping;
 unsigned int maxphysaddr, maxvirtaddr;
 
-const char *environment_description = ENVIRONMENT_DESCRIPTION;
+const char environment_description[] = ENVIRONMENT_DESCRIPTION;
 
 #ifdef CONFIG_PV
 /* Filled in by head_pv.S */
diff --git a/include/xtf/framework.h b/include/xtf/framework.h
index 7829898..a71bf39 100644
--- a/include/xtf/framework.h
+++ b/include/xtf/framework.h
@@ -6,7 +6,7 @@ void arch_setup(void);
 void test_setup(void);
 
 /* Single line summary of execution environment. */
-extern const char *environment_description;
+extern const char environment_description[];
 
 #endif /* XTF_FRAMEWORK_H */