Hi Michal,

> On 3 Mar 2025, at 09:56, Michal Orzel <michal.or...@amd.com> wrote:
> 
> These functions are generic and used not only for hardware domain. This
> creates confusion when printing any of these panic messages (e.g.
> failure when loading domU kernel would result in informing a user about
> a failure in loading hwdom kernel).
> 
> Signed-off-by: Michal Orzel <michal.or...@amd.com>

Reviewed-by: Bertrand Marquis <bertrand.marq...@arm.com>

Cheers
Bertrand

> ---
> xen/arch/arm/domain_build.c | 4 ++--
> xen/arch/arm/kernel.c       | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index fe05cf6d855f..6531fe019f79 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -2112,12 +2112,12 @@ static void __init initrd_load(struct kernel_info 
> *kinfo)
> 
>     initrd = ioremap_wc(paddr, len);
>     if ( !initrd )
> -        panic("Unable to map the hwdom initrd\n");
> +        panic("Unable to map the %pd initrd\n", kinfo->d);
> 
>     res = copy_to_guest_phys_flush_dcache(kinfo->d, load_addr,
>                                           initrd, len);
>     if ( res != 0 )
> -        panic("Unable to copy the initrd in the hwdom memory\n");
> +        panic("Unable to copy the initrd in the %pd memory\n", kinfo->d);
> 
>     iounmap(initrd);
> }
> diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
> index 80fad8b3362c..6eaf9e2b06b3 100644
> --- a/xen/arch/arm/kernel.c
> +++ b/xen/arch/arm/kernel.c
> @@ -150,12 +150,12 @@ static void __init kernel_zimage_load(struct 
> kernel_info *info)
> 
>     kernel = ioremap_wc(paddr, len);
>     if ( !kernel )
> -        panic("Unable to map the hwdom kernel\n");
> +        panic("Unable to map the %pd kernel\n", info->d);
> 
>     rc = copy_to_guest_phys_flush_dcache(info->d, load_addr,
>                                          kernel, len);
>     if ( rc != 0 )
> -        panic("Unable to copy the kernel in the hwdom memory\n");
> +        panic("Unable to copy the kernel in the %pd memory\n", info->d);
> 
>     iounmap(kernel);
> }
> -- 
> 2.25.1
> 


Reply via email to