Skip to contentSkip to conversation

x86/pvh: Override opt_console_xen earlier

PATCH In review Andrew Cooper 2 participants 2 messages Apr 27, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/pvh: Override opt_console_xen earlier

This allows printk() to work from the start of day, and backtraces from as early as the IDT is set up.

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>

---
 xen/arch/x86/boot/head.S | 3 +++
 xen/arch/x86/setup.c     | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)
xen/arch/x86/boot/head.S +3 -0
index 153a53f250..150f7f90a2 100644
@@ -402,6 +402,9 @@ __pvh_start:
 
         mov     %ebx, sym_esi(pvh_start_info_pa)
 
+        /* Force xen console.  Will revert to user choice in init code. */
+        movb    $-1, sym_esi(opt_console_xen)
+
         /* Prepare gdt and segments */
         add     %esi, sym_esi(gdt_boot_base)
         lgdt    sym_esi(gdt_boot_descr)
xen/arch/x86/setup.c +0 -5
index 885919d5c3..eb56d78c2f 100644
@@ -728,11 +728,6 @@ void __init noreturn __start_xen(unsigned long mbi_p)
 
     if ( pvh_boot )
     {
-        /*
-         * Force xen console to be enabled. We will reset it later in console
-         * initialisation code.
-         */
-        opt_console_xen = -1;
         ASSERT(mbi_p == 0);
         pvh_init(&mbi, &mod);
     }
Signature · 1 line
2.11.0