[Xen-devel] xen/arm: domain_build: Print the correct domain in initrd_load()

Message ID 20190815173258.20752-1-julien.grall@arm.com
State New
Headers show
Series
  • [Xen-devel] xen/arm: domain_build: Print the correct domain in initrd_load()
Related show

Commit Message

Julien Grall Aug. 15, 2019, 5:32 p.m.
initrd_load() can be called by other domain than dom0. To avoid
confusion in the log, print the correct domain.

Signed-off-by: Julien Grall <julien.grall@arm.com>
---
 xen/arch/arm/domain_build.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Volodymyr Babchuk Aug. 16, 2019, 4:32 p.m. | #1
Julien Grall writes:

> initrd_load() can be called by other domain than dom0. To avoid
> confusion in the log, print the correct domain.
>
> Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>

But why didn't you gathered all those patches into one patch series?
> ---
>  xen/arch/arm/domain_build.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 126374f603..33171081ea 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -1818,8 +1818,8 @@ static void __init initrd_load(struct kernel_info *kinfo)
>      paddr = mod->start;
>      len = mod->size;
>  
> -    printk("Loading dom0 initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
> -           paddr, load_addr, load_addr + len);
> +    printk("Loading %pd initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
> +           kinfo->d, paddr, load_addr, load_addr + len);
>  
>      /* Fix up linux,initrd-start and linux,initrd-end in /chosen */
>      node = fdt_path_offset(kinfo->fdt, "/chosen");
Julien Grall Aug. 16, 2019, 4:34 p.m. | #2
On 16/08/2019 17:32, Volodymyr Babchuk wrote:
> 
> Julien Grall writes:
> 
>> initrd_load() can be called by other domain than dom0. To avoid
>> confusion in the log, print the correct domain.
>>
>> Signed-off-by: Julien Grall <julien.grall@arm.com>
> Reviewed-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
> 
> But why didn't you gathered all those patches into one patch series?

Because I couldn't be bothered to write a cover letter for it and
they don't depend on each other...

Cheers,
Stefano Stabellini Oct. 2, 2019, 1:18 a.m. | #3
On Thu, 15 Aug 2019, Julien Grall wrote:
> initrd_load() can be called by other domain than dom0. To avoid
> confusion in the log, print the correct domain.
> 
> Signed-off-by: Julien Grall <julien.grall@arm.com>

Thanks the bug was really annoying.

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
>  xen/arch/arm/domain_build.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 126374f603..33171081ea 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -1818,8 +1818,8 @@ static void __init initrd_load(struct kernel_info *kinfo)
>      paddr = mod->start;
>      len = mod->size;
>  
> -    printk("Loading dom0 initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
> -           paddr, load_addr, load_addr + len);
> +    printk("Loading %pd initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
> +           kinfo->d, paddr, load_addr, load_addr + len);
>  
>      /* Fix up linux,initrd-start and linux,initrd-end in /chosen */
>      node = fdt_path_offset(kinfo->fdt, "/chosen");
> -- 
> 2.11.0
>

Patch

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 126374f603..33171081ea 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1818,8 +1818,8 @@  static void __init initrd_load(struct kernel_info *kinfo)
     paddr = mod->start;
     len = mod->size;
 
-    printk("Loading dom0 initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
-           paddr, load_addr, load_addr + len);
+    printk("Loading %pd initrd from %"PRIpaddr" to 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
+           kinfo->d, paddr, load_addr, load_addr + len);
 
     /* Fix up linux,initrd-start and linux,initrd-end in /chosen */
     node = fdt_path_offset(kinfo->fdt, "/chosen");