With preferred consoles "tty" and "hvc" announced as preferred,
registering "xenboot" early won't result in use of the console: It also
needs to be registered as preferred. Generalize this from being DomU-
only so far.

Signed-off-by: Jan Beulich <jbeul...@suse.com>

--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -1340,7 +1340,6 @@ asmlinkage __visible void __init xen_sta
        boot_params.hdr.hardware_subarch = X86_SUBARCH_XEN;
 
        if (!xen_initial_domain()) {
-               add_preferred_console("xenboot", 0, NULL);
                if (pci_xen)
                        x86_init.pci.arch_init = pci_xen_init;
        } else {
@@ -1383,6 +1382,7 @@ asmlinkage __visible void __init xen_sta
 #endif
        }
 
+       add_preferred_console("xenboot", 0, NULL);
        if (!boot_params.screen_info.orig_video_isVGA)
                add_preferred_console("tty", 0, NULL);
        add_preferred_console("hvc", 0, NULL);


Reply via email to