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@de.bosch.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- added same change to arm32 case ]
master commit: c31d340825
master date: 2016-02-18 10:13:42 +0000
This commit is contained in:
Dirk Behme authored and Jan Beulich committed 2016-02-18 15:25:43 +01:00
1 parent 820311c63d
commit d4e0fcbed6
2 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -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")
+2 -2
View File
@@ -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")
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.