[Xen-changelog] [xen stable-4.6] xen/arm64: Make sure we get all debug output

[patchbot@xxxxxxx]

commit 046e5d0218a0600f9a21fd3b5a5ccfbaaf4357b6
Author:     Dirk Behme <dirk.behme@xxxxxxxxxxxx>
AuthorDate: Thu Feb 18 15:25:20 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Feb 18 15:25:20 2016 +0100

    xen/arm64: Make sure we get all debug output
    
    Starting in the wrong ELx mode I get the following debug output:
    
    ...
    - Current EL 00000004 -
    - Xen must be entered in NS EL2 mode -
    - Boot failed -
    
    The output of "Please update the bootloader" is missing here, because
    string concatenation in gas, unlike in C, keeps the \0 between each
    individual string.
    
    Make sure this is output, too. With this, we get
    
    ...
    - Current EL 00000004 -
    - Xen must be entered in NS EL2 mode -
    - Please update the bootloader -
    - Boot failed -
    
    as intended.
    
    Signed-off-by: Dirk Behme <dirk.behme@xxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    [ ijc -- added same change to arm32 case ]
    master commit: c31d34082555566eb27d0d1eb42962f72fa886d3
    master date: 2016-02-18 10:13:42 +0000
---
 xen/arch/arm/arm32/head.S | 4 ++--
 xen/arch/arm/arm64/head.S | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
index 5c0263e..e1f29bd 100644
--- a/xen/arch/arm/arm32/head.S
+++ b/xen/arch/arm/arm32/head.S
@@ -173,8 +173,8 @@ common_start:
         beq   hyp
 
         /* OK, we're boned. */
-        PRINT("- Xen must be entered in NS Hyp mode -\r\n" \
-              "- Please update the bootloader -\r\n")
+        PRINT("- Xen must be entered in NS Hyp mode -\r\n")
+        PRINT("- Please update the bootloader -\r\n")
         b     fail
 
 hyp:    PRINT("- Xen starting in Hyp mode -\r\n")
diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index 9ed9a93..19fa2bb 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -309,8 +309,8 @@ common_start:
         b.eq  el2 /* Yes */
 
         /* OK, we're boned. */
-        PRINT("- Xen must be entered in NS EL2 mode -\r\n" \
-              "- Please update the bootloader -\r\n")
+        PRINT("- Xen must be entered in NS EL2 mode -\r\n")
+        PRINT("- Please update the bootloader -\r\n")
         b fail
 
 el2:    PRINT("- Xen starting at EL2 -\r\n")
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog