[PATCH v2 03/19] xen/arm: Move parse_vwfi from trap.c to domain.c

[Wei Chen <Wei.Chen@arm.com>]

In the past, we'll set the HCR_EL2 while Xen is booting in init_traps.
And the command line parameter "vwfi" will affect the value of setting
HCR_EL2. So we placed the parse_vwfi in trap.c to avoid exporting vwfi
to other source files.

But in previous patch of this series, we had removed the HCR_EL2 setting
from init_traps. Keep parse_vwfi in trap.c is pointless. And we will set
the HCR_EL2 for each domain individually while it's creating in the later
patch of this series. So we move parse_vwfi to domain.c for preparation.

Signed-off-by: Wei Chen <Wei.Chen@arm.com>
---
 xen/arch/arm/domain.c | 14 ++++++++++++++
 xen/arch/arm/traps.c  | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index bb327da..a327a3b 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -38,6 +38,20 @@
 
 DEFINE_PER_CPU(struct vcpu *, curr_vcpu);
 
+static enum {
+	TRAP,
+	NATIVE,
+} vwfi;
+
+static void __init parse_vwfi(const char *s)
+{
+	if ( !strcmp(s, "native") )
+		vwfi = NATIVE;
+	else
+		vwfi = TRAP;
+}
+custom_param("vwfi", parse_vwfi);
+
 void idle_loop(void)
 {
     for ( ; ; )
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 2f03f29..48b3e3c 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -101,20 +101,6 @@ static int debug_stack_lines = 40;
 
 integer_param("debug_stack_lines", debug_stack_lines);
 
-static enum {
-	TRAP,
-	NATIVE,
-} vwfi;
-
-static void __init parse_vwfi(const char *s)
-{
-	if ( !strcmp(s, "native") )
-		vwfi = NATIVE;
-	else
-		vwfi = TRAP;
-}
-custom_param("vwfi", parse_vwfi);
-
 void init_traps(void)
 {
     /* Setup Hyp vector base */
-- 
2.7.4


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