From c31d34082555566eb27d0d1eb42962f72fa886d3 Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Thu, 4 Feb 2016 17:49:35 +0100 Subject: [PATCH] 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 Acked-by: Ian Campbell [ ijc -- added same change to arm32 case ] --- 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 5c0263ea15..e1f29bdebc 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 9ed9a93029..19fa2bb3f7 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") -- 2.39.5