From nobody Wed Dec 4 19:28:06 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=1729471838; cv=pass; d=zohomail.com; s=zohoarc; b=kPixRUcusi5F0E+PValxKO1BUZx8KIoo0hITh5epMaFWOPCQhmXOLmrzmuA8LPZDNRIMWN5m+vMp/3NoHG3r74uedetlnGoiq8x/O298BX4YHAeTf9HE1MaHKSNRZQcjGj0IQZIbGP+pJcfnBWhkHi7AwkS7D3FLsvSdB9IGYJw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729471838; 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=Jx51Zf1zwygUUllbZAd+b9gYxFDST6JrxccGSqHc+vc=; b=ltzWcytgpw1g6LZ+UoKCfl9LlT5SnPTDbCVph2EFU39KvqJ4uJqtPUkprsEzd/FMaxbK95nPtYF/VVS6LJgFiW6KtxFvXcajkzRHjx0Z1RGg3v9rhacKeIuY5MXEPxHGZrjxoVw6PUYWAHh+8pU5bNjqrLsPlpQV0YduvtCIDYo= 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 1729471838275968.8842560348334; Sun, 20 Oct 2024 17:50:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.822930.1236892 (Exim 4.92) (envelope-from ) id 1t2gcr-0006Ss-2D; Mon, 21 Oct 2024 00:50:25 +0000 Received: by outflank-mailman (output) from mailman id 822930.1236892; Mon, 21 Oct 2024 00:50:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t2gcq-0006Sl-Vh; Mon, 21 Oct 2024 00:50:24 +0000 Received: by outflank-mailman (input) for mailman id 822930; Mon, 21 Oct 2024 00:50:24 +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 1t2gcq-0006SZ-8Y for xen-devel@lists.xenproject.org; Mon, 21 Oct 2024 00:50:24 +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 72bfce43-8f46-11ef-99a3-01e77a169b0f; Mon, 21 Oct 2024 02:50:22 +0200 (CEST) Received: by mx.zohomail.com with SMTPS id 1729471619758245.98953686943776; Sun, 20 Oct 2024 17:46:59 -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: 72bfce43-8f46-11ef-99a3-01e77a169b0f ARC-Seal: i=1; a=rsa-sha256; t=1729471622; cv=none; d=zohomail.com; s=zohoarc; b=IRqZaQ4+kh/HRypaOU5C5US+K0CJvsmhAIFWyD4SbQ8osnR2ivVgxks1gf52rW3J2X0mJo2rMgB2BGKmwXXv2L5/BS73P9i/kGlW1NwFIu75IrEFeObVnwUlJ3pYuvAmjswTJb3XLfBrO0j0ih+YdavyQ6rwLusYmr1qrzpIyJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729471622; 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=Jx51Zf1zwygUUllbZAd+b9gYxFDST6JrxccGSqHc+vc=; b=HUbtKCinlxiyjKm2U/HqD/m266ijeF9U5/81vdsyTWqjHOqgbkAx/LAmHW1dZCOpBAdliHhYUZlqy4lFa4ggk+3AZZ5soxbVzrQdpi5EcYIudxSTlzj/mvDOZ1l5UpjfCZ80pz0fABAOtkP59VRcR01UVyvRYyxA5avq25Aj8kI= 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=1729471622; 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=Jx51Zf1zwygUUllbZAd+b9gYxFDST6JrxccGSqHc+vc=; b=IHCOGVlafenqtX/hDFMkmGm89FkiB7nolG3pT236cn0cBDr3plYLAuXefKNoLmkA 24ZAizCLX6VUoFKVKdblOYxo/YUNTRHjRs0moa23Ueoch/K9FoyVVvwAzBCavaBF1qK TagzaIh3wBeZES4/3Iz2BoHDZEQHEcTRf884iBpI= 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, Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v7 31/38] x86/boot: remove mod from struct boot_module Date: Sun, 20 Oct 2024 20:46:06 -0400 Message-Id: <20241021004613.18793-32-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241021004613.18793-1-dpsmith@apertussolutions.com> References: <20241021004613.18793-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: 1729471839984116600 Content-Type: text/plain; charset="utf-8" With all references to mod field removed, remove the mod field from struct boot_module. Signed-off-by: Daniel P. Smith Reviewed-by: Jason Andryuk --- xen/arch/x86/include/asm/bootinfo.h | 4 ---- xen/arch/x86/setup.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm= /bootinfo.h index 941363601db7..eaed99b64e57 100644 --- a/xen/arch/x86/include/asm/bootinfo.h +++ b/xen/arch/x86/include/asm/bootinfo.h @@ -8,7 +8,6 @@ #ifndef X86_BOOTINFO_H #define X86_BOOTINFO_H =20 -#include #include =20 /* Max number of boot modules a bootloader can provide in addition to Xen = */ @@ -25,9 +24,6 @@ enum bootmod_type { }; =20 struct boot_module { - /* Transitionary only */ - module_t *mod; - /* * A boot module may contain a compressed kernel that will require * additional space, before the module data, into which the kernel wil= l be diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2102923cd510..1fda462ba1d0 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -314,8 +314,6 @@ static struct boot_info *__init multiboot_fill_boot_inf= o(unsigned long mbi_p) */ for ( i =3D 0; i < MAX_NR_BOOTMODS && i < bi->nr_modules; i++ ) { - bi->mods[i].mod =3D &mods[i]; - bi->mods[i].cmdline =3D (paddr_t)mods[i].string; =20 if ( !efi_enabled(EFI_LOADER) ) @@ -331,7 +329,6 @@ static struct boot_info *__init multiboot_fill_boot_inf= o(unsigned long mbi_p) } =20 /* Variable 'i' should be one entry past the last module. */ - bi->mods[i].mod =3D &mods[bi->nr_modules]; bi->mods[i].start =3D mods[i].mod_start; bi->mods[i].size =3D mods[i].mod_end - mods[i].mod_start; bi->mods[i].type =3D BOOTMOD_XEN; --=20 2.30.2