From nobody Sun Nov 24 15:43:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) ARC-Seal: i=2; a=rsa-sha256; t=1729184924; cv=pass; d=zohomail.com; s=zohoarc; b=IZNFCCVvTCXirRkYo8YjYZlXs01Hc0zBsco4TxIpUvcaC8E34cU56qcG1g95NADkpI0FdL4boqxxEdf4NIdwFE4iHlvqPGzxdDGUUZEXnpMf+QBH9HLKRh4GAbyc1UgRPHnxpAs8qZ8AJZti0bgSsLlvbE7SUGnWX95R/Sw0p1M= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729184924; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Dr1jKzgUHAaiQbYekBVD6PQo4dQeZnEBKNdNITplfLE=; b=jocsKjQpTjXJhXm5Kdpq2BWbVYinChbEaxd8GzIAvCGS7eJ1aer55kwK4Sy4iKb62GYQBuoZtuswT6SbFijmBiTT6B5vmkuExYXPkhyCQPJu+3D6JxAO2jln6LXUb9sEqZid5IYyK+rjqJKc2ryN8bMWn44Pibqv35rMcVeu3JE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1729184924458327.46248798836325; Thu, 17 Oct 2024 10:08:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.820894.1234599 (Exim 4.92) (envelope-from ) id 1t1Tyz-00070D-NG; Thu, 17 Oct 2024 17:08:17 +0000 Received: by outflank-mailman (output) from mailman id 820894.1234599; Thu, 17 Oct 2024 17:08:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t1Tyz-0006zY-JL; Thu, 17 Oct 2024 17:08:17 +0000 Received: by outflank-mailman (input) for mailman id 820894; Thu, 17 Oct 2024 17:08:16 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t1Tuv-0006TN-3d for xen-devel@lists.xenproject.org; Thu, 17 Oct 2024 17:04:05 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id cebfa7dd-8ca9-11ef-99a3-01e77a169b0f; Thu, 17 Oct 2024 19:04:03 +0200 (CEST) Received: by mx.zohomail.com with SMTPS id 1729184618449299.4483272125001; Thu, 17 Oct 2024 10:03:38 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cebfa7dd-8ca9-11ef-99a3-01e77a169b0f ARC-Seal: i=1; a=rsa-sha256; t=1729184621; cv=none; d=zohomail.com; s=zohoarc; b=Jj69mog7FESSW+fvVP3+RCzMBMmqWmc3v0uPKmHRi8b263x7K6eX/88EhvivAybvDSZJa+Kwk8WgtHtneYbmvzcvenJNbaglQ/syLwxfUkCi3W2iddyWxMHn1+sEsDXlWJUSk0SoyD4hhDJzR/HlBk+1feG0SIXWvd/XQGZDPUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729184621; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=Dr1jKzgUHAaiQbYekBVD6PQo4dQeZnEBKNdNITplfLE=; b=TZkx8ohR4MO2a4uoshPcehr5lwl0XBEyWwM/xabNwAFb84nam0gObY5GPqStjoLYH/j9lxq21KdeAFDSCWsL2OkbdbuVDCwMf9E39nDkKiGpS93UmXu+6tblwaS4WhuSZg939o5wxD4Xv8W6y/hdsLAQuOfbocr2asoZ4AlAdRU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@apertussolutions.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1729184621; s=zoho; d=apertussolutions.com; i=dpsmith@apertussolutions.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=Dr1jKzgUHAaiQbYekBVD6PQo4dQeZnEBKNdNITplfLE=; b=GR6WiaXfoG7f/aZ+nKcXzYLlpEwLqBIDprZYcMvRlxkOu42PG34CwqjDnJScBtBX m7yW0hLY5gPRPTLFjrFfE8nsR/dALcfiMNM7IyHCxtM6k2K8yhPsIhyA1NMENl3QY0S ejNWVze6O2NbaMBbZMtJjPcKYoLU3t22/oaw9PUQ= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org Cc: "Daniel P. Smith" , jason.andryuk@amd.com, christopher.w.clark@gmail.com, stefano.stabellini@amd.com, Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v6 03/44] x86/boot: move cmdline to boot info Date: Thu, 17 Oct 2024 13:02:43 -0400 Message-Id: <20241017170325.3842-4-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241017170325.3842-1-dpsmith@apertussolutions.com> References: <20241017170325.3842-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-ZohoMail-DKIM: pass (identity dpsmith@apertussolutions.com) X-ZM-MESSAGEID: 1729184948669116600 Content-Type: text/plain; charset="utf-8" Transition Xen's command line to being held in struct boot_info. No functional change intended. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- Changes since v5: - reorder struct boot_module fields --- xen/arch/x86/include/asm/bootinfo.h | 1 + xen/arch/x86/setup.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm= /bootinfo.h index bec35e7c2f23..efbbd30cc514 100644 --- a/xen/arch/x86/include/asm/bootinfo.h +++ b/xen/arch/x86/include/asm/bootinfo.h @@ -14,6 +14,7 @@ */ struct boot_info { const char *loader; + const char *cmdline; =20 unsigned int nr_modules; }; 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 @@ -274,6 +274,8 @@ static int __init cf_check parse_acpi_param(const char = *s) } custom_param("acpi", parse_acpi_param); =20 +static const char *cmdline_cook(const char *p, const char *loader_name); + static const module_t *__initdata initial_images; =20 struct boot_info __initdata xen_boot_info; @@ -288,6 +290,12 @@ static struct boot_info *__init multiboot_fill_boot_in= fo(unsigned long mbi_p) bi->loader =3D (mbi->flags & MBI_LOADERNAME) ? __va(mbi->boot_loader_n= ame) : "unknown"; =20 + /* Parse the command-line options. */ + if ( mbi->flags & MBI_CMDLINE ) + bi->cmdline =3D cmdline_cook(__va(mbi->cmdline), bi->loader); + else + bi->cmdline =3D ""; + return bi; } =20 @@ -981,7 +989,7 @@ static struct domain *__init create_dom0(const module_t= *image, =20 void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) { - const char *memmap_type =3D NULL, *cmdline =3D ""; + const char *memmap_type =3D NULL; char *kextra; void *bsp_stack; struct cpu_info *info =3D get_cpu_info(), *bsp_info; @@ -1035,11 +1043,7 @@ void asmlinkage __init noreturn __start_xen(unsigned= long mbi_p) =20 bi =3D multiboot_fill_boot_info(mbi_p); =20 - /* Parse the command-line options. */ - if ( mbi->flags & MBI_CMDLINE ) - cmdline =3D cmdline_cook(__va(mbi->cmdline), bi->loader); - - if ( (kextra =3D strstr(cmdline, " -- ")) !=3D NULL ) + if ( (kextra =3D strstr(bi->cmdline, " -- ")) !=3D NULL ) { /* * Options after ' -- ' separator belong to dom0. @@ -1050,7 +1054,7 @@ void asmlinkage __init noreturn __start_xen(unsigned = long mbi_p) kextra +=3D 3; while ( kextra[1] =3D=3D ' ' ) kextra++; } - cmdline_parse(cmdline); + cmdline_parse(bi->cmdline); =20 /* Must be after command line argument parsing and before * allocing any xenheap structures wanted in lower memory. */ @@ -1080,7 +1084,7 @@ void asmlinkage __init noreturn __start_xen(unsigned = long mbi_p) =20 printk("Bootloader: %s\n", bi->loader); =20 - printk("Command line: %s\n", cmdline); + printk("Command line: %s\n", bi->cmdline); =20 printk("Xen image load base address: %#lx\n", xen_phys_start); if ( hypervisor_name ) --=20 2.30.2