Re: [PATCH v4 02/11] xen/dom0less: rename kernel_zimage_probe() to kernel_image_probe()

[Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>]

On 4/29/26 12:59 PM, Luca Fancellu wrote:
> Hi Oleksii,
>
> > diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
> > index 9395b5af8745..a5554714cd7b 100644
> > --- a/xen/arch/arm/kernel.c
> > +++ b/xen/arch/arm/kernel.c
> > @@ -101,8 +101,8 @@ static paddr_t __init kernel_zimage_place(struct 
> > kernel_info *info)
> >      paddr_t load_addr;
> >
> > #ifdef CONFIG_HAS_DOMAIN_TYPE
> > -    if ( (info->type == DOMAIN_64BIT) && (info->zimage.start == 0) )
> > -        return mem->bank[0].start + info->zimage.text_offset;
> > +    if ( (info->type == DOMAIN_64BIT) && (info->image.start == 0) )
> > +        return mem->bank[0].start + info->image.text_offset;
> > #endif
> >
> >      /*
> > @@ -111,19 +111,19 @@ static paddr_t __init kernel_zimage_place(struct 
> > kernel_info *info)
> >       * and above 32MiB. Load it as high as possible within these
> >       * constraints, while also avoiding the DTB.
> >       */
> > -    if ( info->zimage.start == 0 )
> > +    if ( info->image.start == 0 )
> >      {
> >          paddr_t load_end;
> >
> >          load_end = mem->bank[0].start + mem->bank[0].size;
> >          load_end = MIN(mem->bank[0].start + MB(128), load_end);
> >
> > -        load_addr = load_end - info->zimage.len;
> > +        load_addr = load_end - info->image.len;
> >          /* Align to 2MB */
> >          load_addr &= ~((2 << 20) - 1);
> >      }
> >      else
> > -        load_addr = info->zimage.start;
> > +        load_addr = info->image.start;
> >
> >      return load_addr;
> > }
> > @@ -131,8 +131,8 @@ static paddr_t __init kernel_zimage_place(struct 
> > kernel_info *info)
> > static void __init kernel_zimage_load(struct kernel_info *info)
> > {
> >      paddr_t load_addr = kernel_zimage_place(info);
> > -    paddr_t paddr = info->zimage.kernel_addr;
> > -    paddr_t len = info->zimage.len;
> > +    paddr_t paddr = info->image.kernel_addr;
> > +    paddr_t len = info->image.len;
> >      void *kernel;
> >      int rc;
> >
> > @@ -215,7 +215,7 @@ int __init kernel_uimage_probe(struct kernel_info *info,
> >          return -EOPNOTSUPP;
> >      }
> >
> > -    info->zimage.start = be32_to_cpu(uimage.load);
> > +    info->image.start = be32_to_cpu(uimage.load);
> >      info->entry = be32_to_cpu(uimage.ep);
> >
> >      /*
> > @@ -224,20 +224,20 @@ int __init kernel_uimage_probe(struct kernel_info *info,
> >       * independent image. That means Xen is free to load such an image at
> >       * any valid address.
> >       */
> > -    if ( info->zimage.start == 0 )
> > +    if ( info->image.start == 0 )
> >          printk(XENLOG_INFO
> >                 "No load address provided. Xen will decide where to load 
> > it.\n");
> >      else
> >          printk(XENLOG_INFO
> >                 "Provided load address: %"PRIpaddr" and entry address: 
> > %"PRIpaddr"\n",
> > -               info->zimage.start, info->entry);
> > +               info->image.start, info->entry);
> >
> >      /*
> >       * If the image supports position independent execution, then user cannot
> >       * provide an entry point as Xen will load such an image at any appropriate
> >       * memory address. Thus, we need to return error.
> >       */
> > -    if ( (info->zimage.start == 0) && (info->entry != 0) )
> > +    if ( (info->image.start == 0) && (info->entry != 0) )
> >      {
> >          printk(XENLOG_ERR
> >                 "Entry point cannot be non zero for PIE image.\n");
> > @@ -257,13 +257,13 @@ int __init kernel_uimage_probe(struct kernel_info *info,
> >          if ( rc )
> >              return rc;
> >
> > -        info->zimage.kernel_addr = mod->start;
> > -        info->zimage.len = mod->size;
> > +        info->image.kernel_addr = mod->start;
> > +        info->image.len = mod->size;
> >      }
> >      else
> >      {
> > -        info->zimage.kernel_addr = addr + sizeof(uimage);
> > -        info->zimage.len = len;
> > +        info->image.kernel_addr = addr + sizeof(uimage);
> > +        info->image.len = len;
> >      }
> >
> >      info->load = kernel_zimage_load;
> > @@ -289,7 +289,7 @@ int __init kernel_uimage_probe(struct kernel_info *info,
> >       * Thus, Xen uses uimage.load attribute to determine the load address and
> >       * zimage.text_offset is ignored.
> Should we update the comment as well?
>
> Also in here:
> https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=xen/include/xen/fdt-kernel.h;h=4d0467bb396a9cf317954fd511469e7f56d67844;hb=refs/heads/staging#l111
Agree, it should be updated. I'll do that in the next version.

Thanks.

~ Oleksii