This refactors xen cmdline processing into a general framework
under the new boot info abstraction.
Signed-off-by: Daniel P. Smith
Reviewed-by: Christopher Clark
---
xen/arch/x86/include/asm/bootinfo.h | 49
xen/arch/x86/setup.c| 58 -
xen/include/xen/bootinfo.h | 11 ++
3 files changed, 68 insertions(+), 50 deletions(-)
diff --git a/xen/arch/x86/include/asm/bootinfo.h
b/xen/arch/x86/include/asm/bootinfo.h
index e5135e402b..2fcd576023 100644
--- a/xen/arch/x86/include/asm/bootinfo.h
+++ b/xen/arch/x86/include/asm/bootinfo.h
@@ -45,4 +45,53 @@ struct __packed mb_memmap {
uint32_t type;
};
+static inline bool loader_is_grub2(const char *loader_name)
+{
+/* GRUB1="GNU GRUB 0.xx"; GRUB2="GRUB 1.xx" */
+const char *p = strstr(loader_name, "GRUB ");
+return (p != NULL) && (p[5] != '0');
+}
+
+static inline char *arch_prepare_cmdline(char *p, struct arch_boot_info *arch)
+{
+p = p ? : "";
+
+/* Strip leading whitespace. */
+while ( *p == ' ' )
+p++;
+
+/* GRUB2 and PVH don't not include image name as first item on command
line. */
+if ( !(arch->xenguest || loader_is_grub2(arch->boot_loader_name)) )
+{
+/* Strip image name plus whitespace. */
+while ( (*p != ' ') && (*p != '\0') )
+p++;
+while ( *p == ' ' )
+p++;
+}
+
+return p;
+}
+
+static inline char *arch_bootinfo_prepare_cmdline(
+char *cmdline, struct arch_boot_info *arch)
+{
+if ( !cmdline )
+return "";
+
+if ( (arch->kextra = strstr(cmdline, " -- ")) != NULL )
+{
+/*
+ * Options after ' -- ' separator belong to dom0.
+ * 1. Orphan dom0's options from Xen's command line.
+ * 2. Skip all but final leading space from dom0's options.
+ */
+*arch->kextra = '\0';
+arch->kextra += 3;
+while ( arch->kextra[1] == ' ' ) arch->kextra++;
+}
+
+
+return arch_prepare_cmdline(cmdline, arch);
+}
#endif
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index ad37f4a658..e4060d6219 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -716,34 +716,6 @@ ignore_param("edid");
*/
ignore_param("placeholder");
-static bool __init loader_is_grub2(const char *loader_name)
-{
-/* GRUB1="GNU GRUB 0.xx"; GRUB2="GRUB 1.xx" */
-const char *p = strstr(loader_name, "GRUB ");
-return (p != NULL) && (p[5] != '0');
-}
-
-static char * __init cmdline_cook(char *p, const char *loader_name)
-{
-p = p ? : "";
-
-/* Strip leading whitespace. */
-while ( *p == ' ' )
-p++;
-
-/* GRUB2 and PVH don't not include image name as first item on command
line. */
-if ( xen_guest || loader_is_grub2(loader_name) )
-return p;
-
-/* Strip image name plus whitespace. */
-while ( (*p != ' ') && (*p != '\0') )
-p++;
-while ( *p == ' ' )
-p++;
-
-return p;
-}
-
static unsigned int __init copy_bios_e820(struct e820entry *map, unsigned int
limit)
{
unsigned int n = min(bootsym(bios_e820nr), limit);
@@ -754,8 +726,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, const char *loader)
+static struct domain *__init create_dom0(const struct boot_info *bi)
{
struct xen_domctl_createdomain dom0_cfg = {
.flags = IS_ENABLED(CONFIG_TBOOT) ? XEN_DOMCTL_CDF_s3_integrity : 0,
@@ -804,16 +775,16 @@ static struct domain *__init create_dom0(
/* Grab the DOM0 command line. */
cmdline = (image->string.kind == BOOTSTR_CMDLINE) ?
image->string.bytes : NULL;
-if ( cmdline || kextra )
+if ( cmdline || bi->arch->kextra )
{
static char __initdata dom0_cmdline[MAX_GUEST_CMDLINE];
-cmdline = cmdline_cook(cmdline, loader);
+cmdline = arch_prepare_cmdline(cmdline, bi->arch);
safe_strcpy(dom0_cmdline, cmdline);
-if ( kextra )
+if ( bi->arch->kextra )
/* kextra always includes exactly one leading space. */
-safe_strcat(dom0_cmdline, kextra);
+safe_strcat(dom0_cmdline, bi->arch->kextra);
/* Append any extra parameters. */
if ( skip_ioapic_setup && !strstr(dom0_cmdline, "noapic") )
@@ -861,7 +832,7 @@ static struct domain *__init create_dom0(
void __init noreturn __start_xen(unsigned long bi_p)
{
char *memmap_type = NULL;
-char *cmdline, *kextra, *loader;
+char *cmdline, *loader;
void *bsp_stack;
struct cpu_info *info = get_cpu_info(), *bsp_info;
unsigned int initrdidx, num_parked = 0;
@@ -929,20 +900,7 @@ void __init noreturn __start_xen(unsigned long bi_p)
? boot_info->arch->boot_loader_name : "unknown";
/* Parse the command-line options. */
-cmdline =
