dtb_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>
---
Changes in v2:
- Fix the second print in the function as well.
---
xen/arch/arm/domain_build.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 4e51e22927..126374f603 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1787,15 +1787,17 @@ static void __init dtb_load(struct kernel_info *kinfo)
{
unsigned long left;
- printk("Loading dom0 DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
- kinfo->dtb_paddr, kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt));
+ printk("Loading %pd DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
+ kinfo->d, kinfo->dtb_paddr,
+ kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt));
left = copy_to_guest_phys_flush_dcache(kinfo->d, kinfo->dtb_paddr,
kinfo->fdt,
fdt_totalsize(kinfo->fdt));
if ( left != 0 )
- panic("Unable to copy the DTB to dom0 memory (left = %lu bytes)\n", left);
+ panic("Unable to copy the DTB to %pd memory (left = %lu bytes)\n",
+ kinfo->d, left);
xfree(kinfo->fdt);
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
On Thu, 15 Aug 2019, Julien Grall wrote: > dtb_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: Stefano Stabellini <sstabellini@kernel.org> > --- > Changes in v2: > - Fix the second print in the function as well. > --- > xen/arch/arm/domain_build.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index 4e51e22927..126374f603 100644 > --- a/xen/arch/arm/domain_build.c > +++ b/xen/arch/arm/domain_build.c > @@ -1787,15 +1787,17 @@ static void __init dtb_load(struct kernel_info *kinfo) > { > unsigned long left; > > - printk("Loading dom0 DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", > - kinfo->dtb_paddr, kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); > + printk("Loading %pd DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", > + kinfo->d, kinfo->dtb_paddr, > + kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); > > left = copy_to_guest_phys_flush_dcache(kinfo->d, kinfo->dtb_paddr, > kinfo->fdt, > fdt_totalsize(kinfo->fdt)); > > if ( left != 0 ) > - panic("Unable to copy the DTB to dom0 memory (left = %lu bytes)\n", left); > + panic("Unable to copy the DTB to %pd memory (left = %lu bytes)\n", > + kinfo->d, left); > xfree(kinfo->fdt); > } > > -- > 2.11.0 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Hi, Hmm, it looks like I forgot this patch before the freeze. Juergen, are you happy with this to go in Xen 4.13? Cheers, On 15/08/2019 18:29, Julien Grall wrote: > dtb_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> > > --- > Changes in v2: > - Fix the second print in the function as well. > --- > xen/arch/arm/domain_build.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index 4e51e22927..126374f603 100644 > --- a/xen/arch/arm/domain_build.c > +++ b/xen/arch/arm/domain_build.c > @@ -1787,15 +1787,17 @@ static void __init dtb_load(struct kernel_info *kinfo) > { > unsigned long left; > > - printk("Loading dom0 DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", > - kinfo->dtb_paddr, kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); > + printk("Loading %pd DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", > + kinfo->d, kinfo->dtb_paddr, > + kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); > > left = copy_to_guest_phys_flush_dcache(kinfo->d, kinfo->dtb_paddr, > kinfo->fdt, > fdt_totalsize(kinfo->fdt)); > > if ( left != 0 ) > - panic("Unable to copy the DTB to dom0 memory (left = %lu bytes)\n", left); > + panic("Unable to copy the DTB to %pd memory (left = %lu bytes)\n", > + kinfo->d, left); > xfree(kinfo->fdt); > } > > -- Julien Grall _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Hi Juergen, Gentle ping. Cheers, On 10/10/19 3:43 PM, Julien Grall wrote: > Hi, > > Hmm, it looks like I forgot this patch before the freeze. Juergen, are > you happy with this to go in Xen 4.13? > > Cheers, > > On 15/08/2019 18:29, Julien Grall wrote: >> dtb_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> >> >> --- >> Changes in v2: >> - Fix the second print in the function as well. >> --- >> xen/arch/arm/domain_build.c | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c >> index 4e51e22927..126374f603 100644 >> --- a/xen/arch/arm/domain_build.c >> +++ b/xen/arch/arm/domain_build.c >> @@ -1787,15 +1787,17 @@ static void __init dtb_load(struct kernel_info >> *kinfo) >> { >> unsigned long left; >> - printk("Loading dom0 DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", >> - kinfo->dtb_paddr, kinfo->dtb_paddr + >> fdt_totalsize(kinfo->fdt)); >> + printk("Loading %pd DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", >> + kinfo->d, kinfo->dtb_paddr, >> + kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); >> left = copy_to_guest_phys_flush_dcache(kinfo->d, kinfo->dtb_paddr, >> kinfo->fdt, >> fdt_totalsize(kinfo->fdt)); >> if ( left != 0 ) >> - panic("Unable to copy the DTB to dom0 memory (left = %lu >> bytes)\n", left); >> + panic("Unable to copy the DTB to %pd memory (left = %lu >> bytes)\n", >> + kinfo->d, left); >> xfree(kinfo->fdt); >> } >> > -- Julien Grall _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
On 15.10.19 18:45, Julien Grall wrote: > Hi Juergen, > > Gentle ping. > > Cheers, > > On 10/10/19 3:43 PM, Julien Grall wrote: >> Hi, >> >> Hmm, it looks like I forgot this patch before the freeze. Juergen, are >> you happy with this to go in Xen 4.13? >> >> Cheers, >> >> On 15/08/2019 18:29, Julien Grall wrote: >>> dtb_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> Release-acked-by: Juergen Gross <jgross@suse.com> Juergen _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
© 2016 - 2024 Red Hat, Inc.