[xen master] x86: Dom0 "broken ELF" reporting adjustments

[patchbot@xxxxxxx]

commit 56a9641359a6fb6033d776212ff896d17a37c9bb
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Feb 26 16:04:45 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Feb 26 16:04:45 2024 +0100

    x86: Dom0 "broken ELF" reporting adjustments
    
    elf_load_binary() isn't the primary source of brokenness being
    indicated. Therefore make the respective PVH log message there
    conditional (much like PV has it), and add another instance when
    elf_xen_parse() failed (again matching behavior in the PV case).
    
    Make the PV side match the (new) use of %pd here.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/hvm/dom0_build.c | 5 ++++-
 xen/arch/x86/pv/dom0_build.c  | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
index e59f6657d9..0ceda4140b 100644
--- a/xen/arch/x86/hvm/dom0_build.c
+++ b/xen/arch/x86/hvm/dom0_build.c
@@ -570,6 +570,8 @@ static int __init pvh_load_kernel(struct domain *d, const 
module_t *image,
     if ( (rc = elf_xen_parse(&elf, &parms, true)) != 0 )
     {
         printk("Unable to parse kernel for ELFNOTES\n");
+        if ( elf_check_broken(&elf) )
+            printk("%pd kernel: broken ELF: %s\n", d, elf_check_broken(&elf));
         return rc;
     }
 
@@ -588,7 +590,8 @@ static int __init pvh_load_kernel(struct domain *d, const 
module_t *image,
     if ( rc < 0 )
     {
         printk("Failed to load kernel: %d\n", rc);
-        printk("Xen dom0 kernel broken ELF: %s\n", elf_check_broken(&elf));
+        if ( elf_check_broken(&elf) )
+            printk("%pd kernel: broken ELF: %s\n", d, elf_check_broken(&elf));
         return rc;
     }
 
diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c
index 16d08c6796..d8043fa58a 100644
--- a/xen/arch/x86/pv/dom0_build.c
+++ b/xen/arch/x86/pv/dom0_build.c
@@ -1044,8 +1044,7 @@ int __init dom0_construct_pv(struct domain *d,
 
 out:
     if ( elf_check_broken(&elf) )
-        printk(XENLOG_WARNING "Dom0 kernel broken ELF: %s\n",
-               elf_check_broken(&elf));
+        printk("%pd kernel: broken ELF: %s\n", d, elf_check_broken(&elf));
 
     return rc;
 }
--
generated by git-patchbot for /home/xen/git/xen.git#master