[xen master] x86/PV: ignore PAE_MODE ELF note for 64-bit Dom0

[patchbot@xxxxxxx]

commit d5e1795ab4ed30b77b1c00ad7c125a3aa4be494a
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Apr 4 15:44:11 2023 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Apr 4 15:44:11 2023 +0200

    x86/PV: ignore PAE_MODE ELF note for 64-bit Dom0
    
    Besides a printk() the main effect is slight corruption of the start
    info magic: While that's meant to be xen-3.0-x86_64, it wrongly ended
    up as xen-3.0-x86_64p. (The extended-CR3 VM-assist thus won't be
    enabled anymore either, but that's meaningless to 64-bit PV anyway.)
    
    Note that no known users exist that would have developed a dependency on
    the bogus magic string. In particular Linux, NetBSD, and mini-os have
    been checked.
    
    Fixes: 460060f83d41 ("libelf: use for x86 dom0 builder")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/pv/dom0_build.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c
index a26832ad5d..c99135a552 100644
--- a/xen/arch/x86/pv/dom0_build.c
+++ b/xen/arch/x86/pv/dom0_build.c
@@ -459,8 +459,13 @@ int __init dom0_construct_pv(struct domain *d,
     compat = is_pv_32bit_domain(d);
 
     if ( elf_64bit(&elf) && machine == EM_X86_64 )
+    {
         compatible = true;
 
+        /* Zap meaningless setting which kernels may carry by mistake. */
+        parms.pae = 0;
+    }
+
     if ( elf_msb(&elf) )
         compatible = false;
 
--
generated by git-patchbot for /home/xen/git/xen.git#master