On 17/10/2024 6:02 pm, Daniel P. Smith wrote:
> diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
> index eac0954f42b8..037cdd17386c 100644
> --- a/xen/arch/x86/setup.c
> +++ b/xen/arch/x86/setup.c
> @@ -1035,11 +1043,7 @@ void asmlinkage __init noreturn __start_xen(unsigned
> long mbi_p)
>
> bi = multiboot_fill_boot_info(mbi_p);
>
> - /* Parse the command-line options. */
> - if ( mbi->flags & MBI_CMDLINE )
> - cmdline = cmdline_cook(__va(mbi->cmdline), bi->loader);
> -
> - if ( (kextra = strstr(cmdline, " -- ")) != NULL )
> + if ( (kextra = strstr(bi->cmdline, " -- ")) != NULL )
The /* Parse the command-line options. */ comment refers mostly to ...
> {
> /*
> * Options after ' -- ' separator belong to dom0.
> @@ -1050,7 +1054,7 @@ void asmlinkage __init noreturn __start_xen(unsigned
> long mbi_p)
> kextra += 3;
> while ( kextra[1] == ' ' ) kextra++;
> }
> - cmdline_parse(cmdline);
> + cmdline_parse(bi->cmdline);
..., so should stay in place rather than moving into
multiboot_fill_boot_info().
~Andrew
