elf_load_binary() isn't the primary source of brokenness being indicated. Therefore make the respective 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).
Signed-off-by: Jan Beulich <[email protected]> --- 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 if ( (rc = elf_xen_parse(&elf, &parms, true)) != 0 ) { printk("Unable to parse kernel for ELFNOTES\n"); + if ( elf_check_broken(&elf) ) + printk("Xen dom0 kernel broken ELF: %s\n", elf_check_broken(&elf)); return rc; } @@ -588,7 +590,8 @@ static int __init pvh_load_kernel(struct 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("Xen dom0 kernel broken ELF: %s\n", elf_check_broken(&elf)); return rc; }
