[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v4 27/44] x86/boot: relocate kextra into boot info
Move kextra into struct boot_info, thus no longer needed to be passed as a parameter to create_dom0. Signed-off-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx> --- xen/arch/x86/include/asm/bootinfo.h | 2 ++ xen/arch/x86/setup.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h index 1a325f66b3ba..06b3ecaf7bec 100644 --- a/xen/arch/x86/include/asm/bootinfo.h +++ b/xen/arch/x86/include/asm/bootinfo.h @@ -41,6 +41,8 @@ struct boot_info { const char *boot_loader_name; const char *cmdline; + const char *kextra; + paddr_t mmap_addr; uint32_t mmap_length; }; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f58eb21d00d7..76f25e9d620c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -946,8 +946,7 @@ static unsigned int __init copy_bios_e820(struct e820entry *map, unsigned int li return n; } -static struct domain *__init create_dom0(const struct boot_info *bi, - const char *kextra) +static struct domain *__init create_dom0(const struct boot_info *bi) { static char __initdata cmdline[MAX_GUEST_CMDLINE]; @@ -1001,15 +1000,15 @@ static struct domain *__init create_dom0(const struct boot_info *bi, panic("Error creating d%uv0\n", domid); /* Grab the DOM0 command line. */ - if ( image->early_mod->string || kextra ) + if ( image->early_mod->string || bi->kextra ) { if ( image->early_mod->string ) safe_strcpy(cmdline, cmdline_cook(__va(image->early_mod->string), bi->boot_loader_name)); - if ( kextra ) + if ( bi->kextra ) /* kextra always includes exactly one leading space. */ - safe_strcat(cmdline, kextra); + safe_strcat(cmdline, bi->kextra); /* Append any extra parameters. */ if ( skip_ioapic_setup && !strstr(cmdline, "noapic") ) @@ -1119,6 +1118,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) *kextra = '\0'; kextra += 3; while ( kextra[1] == ' ' ) kextra++; + boot_info->kextra = kextra; } cmdline_parse(boot_info->cmdline); @@ -2131,7 +2131,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) * We're going to setup domain0 using the module(s) that we stashed safely * above our heap. The second module, if present, is an initrd ramdisk. */ - dom0 = create_dom0(boot_info, kextra); + dom0 = create_dom0(boot_info); if ( !dom0 ) panic("Could not set up DOM0 guest OS\n"); -- 2.30.2
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |