diff options
| author | Jan Beulich <JBeulich@suse.com> | 2018-06-25 04:45:49 -0600 |
|---|---|---|
| committer | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2018-08-20 14:46:18 -0400 |
| commit | 71dc05635983ae711694f748d006e107387f1bab (patch) | |
| tree | c11568a02390d53a5778c170796230ac28247c62 | |
| parent | f76c318c779a40cb23ff70d9c5d6e1771987ebba (diff) | |
| download | linux-stable-71dc05635983ae711694f748d006e107387f1bab.tar.gz linux-stable-71dc05635983ae711694f748d006e107387f1bab.tar.bz2 linux-stable-71dc05635983ae711694f748d006e107387f1bab.zip | |
x86/Xen: further refine add_preferred_console() invocations
As the sequence of invocations matters, add "tty" only after "hvc" when
a VGA console is available (which is often the case for Dom0, but hardly
ever for DomU).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
| -rw-r--r-- | arch/x86/xen/enlighten_pv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 419ff4641644..a26a11d8d0eb 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1385,8 +1385,11 @@ asmlinkage __visible void __init xen_start_kernel(void) xen_boot_params_init_edd(); } - add_preferred_console("tty", 0, NULL); + if (!boot_params.screen_info.orig_video_isVGA) + add_preferred_console("tty", 0, NULL); add_preferred_console("hvc", 0, NULL); + if (boot_params.screen_info.orig_video_isVGA) + add_preferred_console("tty", 0, NULL); #ifdef CONFIG_PCI /* PCI BIOS service won't work from a PV guest. */ |