diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-05-06 16:14:22 +0200 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2015-05-28 13:23:11 +0200 |
| commit | f1dddd118c555508ce383b7262f4e6440927bdf4 (patch) | |
| tree | 437072db2fc71ae9f0d60c71de2bf10055d97354 /arch/arm/xen | |
| parent | arm,arm64/xen: move Xen initialization earlier (diff) | |
| download | linux-f1dddd118c555508ce383b7262f4e6440927bdf4.tar.xz linux-f1dddd118c555508ce383b7262f4e6440927bdf4.zip | |
xen/arm: allow console=hvc0 to be omitted for guests
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This patch registers hvc0 as the preferred console if no console
has been specified explicitly on the kernel command line.
The purpose is to allow platform agnostic kernels and boot images
(such as distro installers) to boot in a Xen/ARM domU without the
need to modify the command line by hand.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Julien Grall <julien.grall@linaro.org>
Diffstat (limited to 'arch/arm/xen')
| -rw-r--r-- | arch/arm/xen/enlighten.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 3463a9e1ff65..6c09cc440a2b 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -24,6 +24,7 @@ #include <linux/cpuidle.h> #include <linux/cpufreq.h> #include <linux/cpu.h> +#include <linux/console.h> #include <linux/mm.h> @@ -183,6 +184,9 @@ void __init xen_early_init(void) xen_start_info->flags |= SIF_INITDOMAIN|SIF_PRIVILEGED; else xen_start_info->flags &= ~(SIF_INITDOMAIN|SIF_PRIVILEGED); + + if (!console_set_on_cmdline && !xen_initial_domain()) + add_preferred_console("hvc", 0, NULL); } static int __init xen_guest_init(void) |